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

vm/debugger.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/debugger.h"
 
-#include "vm/code_index_table.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
 #include "vm/globals.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/os.h"
@@ skipping 76 matching lines @@
       function_(Function::ZoneHandle()),
       token_index_(-1),
       line_number_(-1),
       var_descriptors_(NULL),
       desc_indices_(8) {
 }
 
 
 const Function& ActivationFrame::DartFunction() {
   if (function_.IsNull()) {
-    ASSERT(Isolate::Current() != NULL);
-    CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
-    ASSERT(code_index_table != NULL);
-    const Code& code = Code::Handle(code_index_table->LookupCode(pc_));
+    Isolate* isolate = Isolate::Current();
+    ASSERT(isolate != NULL);
+    const Code& code = Code::Handle(StackFrame::LookupCode(isolate, pc_));
     function_ = code.function();
   }
   return function_;
 }
 
 
 const char* Debugger::QualifiedFunctionName(const Function& func) {
   const String& func_name = String::Handle(func.name());
   Class& func_class = Class::Handle(func.owner());
   String& class_name = String::Handle(func_class.Name());
@@ skipping 980 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart