Cleaned up usage of Function::code, since it may be misunderstood that it points to the only Code o…

runtime/vm/object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 3567 matching lines @@
   for (intptr_t i = 0; i < num_parameters; i++) {
     type = ParameterTypeAt(i);
     if (!type.IsInstantiated()) {
       return false;
     }
   }
   return true;
 }
 
 
+bool Function::HasOptimizedCode() const {
+  return HasCode() && Code::Handle(raw_ptr()->code_).is_optimized();
+}
+
+
 const char* Function::ToCString() const {
   const char* f0 = is_static() ? " static" : "";
   const char* f1 = NULL;
   const char* f2 = is_const() ? " const" : "";
   switch (kind()) {
     case RawFunction::kFunction:
     case RawFunction::kClosureFunction:
     case RawFunction::kGetterFunction:
     case RawFunction::kSetterFunction:
       f1 = "";
@@ skipping 4390 matching lines @@
   ASSERT(Isolate::Current() != NULL);
   CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
   ASSERT(code_index_table != NULL);
   Function& function = Function::Handle();
   Code& code = Code::Handle();
   Smi& pc_offset = Smi::Handle();
   const Array& function_array = Array::Handle(raw_ptr()->function_array_);
   const Array& code_array = Array::Handle(raw_ptr()->code_array_);
   const Array& pc_offset_array = Array::Handle(raw_ptr()->pc_offset_array_);
   for (intptr_t i = 0; i < frame_pcs.length(); i++) {
-    function = code_index_table->LookupFunction(frame_pcs[i]);
+    code = code_index_table->LookupCode(frame_pcs[i]);
+    ASSERT(!code.IsNull());
+    function = code.function();
     function_array.SetAt((index + i), function);
-    code = function.code();
     code_array.SetAt((index + i), code);
     pc_offset = Smi::New(frame_pcs[i] - code.EntryPoint());
     pc_offset_array.SetAt((index + i), pc_offset);
   }
 }
 
 
 RawStacktrace* Stacktrace::New(const GrowableArray<uword>& stack_frame_pcs,
                                Heap::Space space) {
   const Class& cls = Class::Handle(
@@ skipping 314 matching lines @@
   result.set_num_args_tested(num_args_tested);
   // Number of array elements in one test entry (num_args_tested + 1)
   intptr_t len = num_args_tested + 1;
   // IC data array must be null terminated (sentinel entry).
   Array& ic_data = Array::Handle(Array::New(len, Heap::kOld));
   result.set_ic_data(ic_data);
   return result.raw();
 }
 
 }  // namespace dart