- Wire the stack frame iterator to use stack maps for traversing objects if there are stack maps in…

vm/disassembler_ia32.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/disassembler.h"
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 #include "platform/utils.h"
 #include "vm/allocation.h"
 #include "vm/code_index_table.h"
 #include "vm/heap.h"
 #include "vm/os.h"
+#include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 // Tables used for decoding of x86 instructions.
 enum OperandOrder {
   UNSET_OP_ORDER = 0,
   REG_OPER_OP_ORDER,
   OPER_REG_OP_ORDER
 };
@@ skipping 395 matching lines @@
     Print(obj.ToCString());
     Print("'");
   } else {
     // 'addr' is not an object, but probably a code address.
     const char* name_of_stub = StubCode::NameOfStub(addr);
     if (name_of_stub != NULL) {
       Print("  [stub: ");
       Print(name_of_stub);
       Print("]");
     } else {
-      CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
-      if (code_index_table != NULL) {
-        // Print only if jumping to entry point.
-        const Code& code = Code::Handle(
-            code_index_table->LookupCode(addr));
-        if (!code.IsNull() && (code.EntryPoint() == addr)) {
-          const Function& function = Function::Handle(code.function());
-          const char* name_of_function = function.ToFullyQualifiedCString();
-          Print(" [");
-          Print(name_of_function);
-          Print("]");
-        }
+      // Print only if jumping to entry point.
+      const Code& code = Code::Handle(
+          StackFrame::LookupCode(Isolate::Current(), addr));
+      if (!code.IsNull() && (code.EntryPoint() == addr)) {
+        const Function& function = Function::Handle(code.function());
+        const char* name_of_function = function.ToFullyQualifiedCString();
+        Print(" [");
+        Print(name_of_function);
+        Print("]");
       }
     }
   }
 }
 
 
 int X86Decoder::PrintRightOperandHelper(uint8_t* modrmp,
                                         RegisterNamePrinter register_printer) {
   int mod, regop, rm;
   GetModRm(*modrmp, &mod, &regop, &rm);
@@ skipping 1145 matching lines @@
                                   human_buffer,
                                   sizeof(human_buffer),
                                   pc);
     pc += instruction_length;
   }
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32