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

runtime/vm/debugger.h

 // 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.
 
 #ifndef VM_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "include/dart_debugger_api.h"
 
 #include "vm/object.h"
@@ skipping 101 matching lines @@
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(CodeBreakpoint);
 };
 
 
 // ActivationFrame represents one dart function activation frame
 // on the call stack.
 class ActivationFrame : public ZoneAllocated {
  public:
-  ActivationFrame(uword pc, uword fp, uword sp,
-                  const Code& code, const Context& ctx);
+  ActivationFrame(uword pc, uword fp, uword sp, const Code& code);
 
   uword pc() const { return pc_; }
   uword fp() const { return fp_; }
   uword sp() const { return sp_; }
   const Function& function() const {
     ASSERT(!function_.IsNull());
     return function_;
   }
   const Code& code() const {
     ASSERT(!code_.IsNull());
     return code_;
   }
 
   RawString* QualifiedFunctionName();
   RawString* SourceUrl();
   RawScript* SourceScript();
   RawLibrary* Library();
   intptr_t TokenPos();
   intptr_t LineNumber();
+  void SetContext(const Context& ctx) { ctx_ = ctx.raw(); }
 
   // The context level of a frame is the context level at the
   // PC/token index of the frame. It determines the depth of the context
   // chain that belongs to the function of this activation frame.
   intptr_t ContextLevel();
 
   const char* ToCString();
 
   intptr_t NumLocalVariables();
 
   void VariableAt(intptr_t i,
                   String* name,
                   intptr_t* token_pos,
                   intptr_t* end_pos,
                   Instance* value);
 
   RawArray* GetLocalVariables();
-  RawContext* CallerContext();
+  RawContext* GetSavedContext();
 
  private:
   intptr_t PcDescIndex();
   intptr_t TryIndex();
   void GetPcDescriptors();
   void GetVarDescriptors();
   void GetDescIndices();
   RawInstance* GetLocalVarValue(intptr_t slot_index);
   RawInstance* GetInstanceCallReceiver(intptr_t num_actual_args);
 
   uword pc_;
   uword fp_;
   uword sp_;
 
   // The anchor of the context chain for this function.
-  const Context& ctx_;
+  Context& ctx_;
   const Code& code_;
   const Function& function_;
   intptr_t token_pos_;
   intptr_t pc_desc_index_;
   intptr_t line_number_;
   intptr_t context_level_;
 
   bool vars_initialized_;
   LocalVarDescriptors& var_descriptors_;
   ZoneGrowableArray<intptr_t> desc_indices_;
@@ skipping 195 matching lines @@
   static EventHandler* event_handler_;
 
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_