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

vm/disassembler_ia32.cc

Index: vm/disassembler_ia32.cc
===================================================================
--- vm/disassembler_ia32.cc	(revision 6294)
+++ vm/disassembler_ia32.cc	(working copy)
@@ -11,6 +11,7 @@
 #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 {
@@ -426,18 +427,15 @@
       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("]");
       }
     }
   }