Minor cleanup of activation frame creation code. Get the code object while iterating the frames as …

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 "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 117 matching lines @@
 }
 
 
 
 void CodeBreakpoint::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&function_));
 }
 
 
 ActivationFrame::ActivationFrame(uword pc, uword fp, uword sp,
+                                 const Code& code,
                                  const Context& ctx)
     : pc_(pc), fp_(fp), sp_(sp),
       ctx_(Context::ZoneHandle(ctx.raw())),
-      function_(Function::ZoneHandle()),
-      code_(Code::ZoneHandle()),
+      code_(Code::ZoneHandle(code.raw())),
+      function_(Function::ZoneHandle(code.function())),
       token_pos_(-1),
       pc_desc_index_(-1),
       line_number_(-1),
       context_level_(-1),
       vars_initialized_(false),
       var_descriptors_(LocalVarDescriptors::ZoneHandle()),
       desc_indices_(8),
       pc_desc_(PcDescriptors::ZoneHandle()) {
 }
 
 
 const Code& ActivationFrame::DartCode() {

[hausner, 2013/02/06 01:22:15]

As discussed offline, this can now be a simple accessor code().

[siva, 2013/02/06 01:41:43]

Done.

-  if (code_.IsNull()) {
-    Isolate* isolate = Isolate::Current();
-    ASSERT(isolate != NULL);
-    code_ = Code::LookupCode(pc_);
-  }
+  ASSERT(!code_.IsNull());
   return code_;
 }
 
 
 const Function& ActivationFrame::DartFunction() {

[hausner, 2013/02/06 01:22:15]

Ditto, turn into function().

[siva, 2013/02/06 01:41:43]

Done.

-  if (function_.IsNull()) {
-    function_ = DartCode().function();
-  }
+  ASSERT(!function_.IsNull());
   return function_;
 }
 
 
 void Debugger::SignalIsolateEvent(EventType type) {
   if (event_handler_ != NULL) {
     Debugger* debugger = Isolate::Current()->debugger();
     ASSERT(debugger != NULL);
     DebuggerEvent event;
     event.type = type;
@@ skipping 695 matching lines @@
   if (event_handler_ != NULL) {
     DebuggerEvent event;
     event.type = kBreakpointResolved;
     event.breakpoint = bpt;
     (*event_handler_)(&event);
   }
 }
 
 
 DebuggerStackTrace* Debugger::CollectStackTrace() {
+  Isolate* isolate = Isolate::Current();
   DebuggerStackTrace* stack_trace = new DebuggerStackTrace(8);
-  Context& ctx = Context::Handle(Isolate::Current()->top_context());
+  Context& ctx = Context::Handle(isolate->top_context());
+  Code& code = Code::Handle(isolate);
   DartFrameIterator iterator;
   StackFrame* frame = iterator.NextFrame();
   while (frame != NULL) {
     ASSERT(frame->IsValid());
     ASSERT(frame->IsDartFrame());
+    code = frame->LookupDartCode();
     ActivationFrame* activation =
-        new ActivationFrame(frame->pc(), frame->fp(), frame->sp(), ctx);
+        new ActivationFrame(frame->pc(), frame->fp(), frame->sp(), code, ctx);
     ctx = activation->CallerContext();
     stack_trace->AddActivation(activation);
     frame = iterator.NextFrame();
   }
   return stack_trace;
 }
 
 
 void Debugger::SetExceptionPauseInfo(Dart_ExceptionPauseInfo pause_info) {
   ASSERT((pause_info == kNoPauseOnExceptions) ||
@@ skipping 826 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart