Fix for issues 6080 - pass in the Isolate's top context into the stub for invoking dart code from n…

runtime/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 116 matching lines @@
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&function_));
 }
 
 
 
 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)
+ActivationFrame::ActivationFrame(uword pc, uword fp, uword sp, const Code& code)
     : pc_(pc), fp_(fp), sp_(sp),
-      ctx_(Context::ZoneHandle(ctx.raw())),
+      ctx_(Context::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()) {
@@ skipping 181 matching lines @@
           context_level_ = var_info.index;
         }
       }
     }
     ASSERT(context_level_ >= 0);
   }
   return context_level_;
 }
 
 
-RawContext* ActivationFrame::CallerContext() {
+RawContext* ActivationFrame::GetSavedContext() {
   GetVarDescriptors();
   intptr_t var_desc_len = var_descriptors_.Length();
   for (int i = 0; i < var_desc_len; i++) {
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors_.GetInfo(i, &var_info);
     if (var_info.kind == RawLocalVarDescriptors::kContextChain) {
       return reinterpret_cast<RawContext*>(GetLocalVarValue(var_info.index));
     }
   }
-  // Caller uses same context chain.
-  return ctx_.raw();
+  UNREACHABLE();
+  return Context::null();
 }
 
 
 ActivationFrame* DebuggerStackTrace::GetHandlerFrame(
     const Instance& exc_obj) const {
   ExceptionHandlers& handlers = ExceptionHandlers::Handle();
   Array& handled_types = Array::Handle();
   AbstractType& type = Type::Handle();
   const TypeArguments& no_instantiator = TypeArguments::Handle();
   for (int frame_index = 0; frame_index < Length(); frame_index++) {
@@ skipping 487 matching lines @@
     (*event_handler_)(&event);
   }
 }
 
 
 DebuggerStackTrace* Debugger::CollectStackTrace() {
   Isolate* isolate = Isolate::Current();
   DebuggerStackTrace* stack_trace = new DebuggerStackTrace(8);
   Context& ctx = Context::Handle(isolate->top_context());
   Code& code = Code::Handle(isolate);
-  DartFrameIterator iterator;
+  StackFrameIterator iterator(false);
   StackFrame* frame = iterator.NextFrame();
+  bool get_saved_context = false;
   while (frame != NULL) {
     ASSERT(frame->IsValid());
-    ASSERT(frame->IsDartFrame());
-    code = frame->LookupDartCode();
-    ActivationFrame* activation =
-        new ActivationFrame(frame->pc(), frame->fp(), frame->sp(), code, ctx);
-    ctx = activation->CallerContext();
-    stack_trace->AddActivation(activation);
+    if (frame->IsDartFrame()) {
+      code = frame->LookupDartCode();
+      ActivationFrame* activation = new ActivationFrame(frame->pc(),
+                                                        frame->fp(),
+                                                        frame->sp(),
+                                                        code);
+      if (get_saved_context) {
+        ctx = activation->GetSavedContext();
+      }
+      activation->SetContext(ctx);
+      stack_trace->AddActivation(activation);
+      get_saved_context = activation->function().IsClosureFunction();
+    } else if (frame->IsEntryFrame()) {
+      ctx = reinterpret_cast<EntryFrame*>(frame)->SavedContext();
+      get_saved_context = false;
+    }
     frame = iterator.NextFrame();
   }
   return stack_trace;
 }
 
 
 void Debugger::SetExceptionPauseInfo(Dart_ExceptionPauseInfo pause_info) {
   ASSERT((pause_info == kNoPauseOnExceptions) ||
          (pause_info == kPauseOnUnhandledExceptions) ||
          (pause_info == kPauseOnAllExceptions));
@@ skipping 824 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart