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

runtime/vm/stack_frame.h

 // Copyright (c) 2011, 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_STACK_FRAME_H_
 #define VM_STACK_FRAME_H_
 
 #include "vm/allocation.h"
 #include "vm/object.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 // Forward declarations.
 class ObjectPointerVisitor;
+class RawContext;
 
 
 // Generic stack frame.
 class StackFrame : public ValueObject {
  public:
   virtual ~StackFrame() { }
 
   // Accessors to get the pc, sp and fp of a frame.
   uword sp() const { return sp_; }
   uword fp() const { return fp_; }
@@ skipping 85 matching lines @@
 
 // Entry Frame is used to mark the transition from dart VM runtime code into
 // dart code.
 class EntryFrame : public StackFrame {
  public:
   bool IsValid() const { return StubCode::InInvocationStub(pc()); }
   bool IsDartFrame() const { return false; }
   bool IsStubFrame() const { return false; }
   bool IsEntryFrame() const { return true; }
 
+  RawContext* SavedContext() const;
+
   // Visit objects in the frame.
   virtual void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
  protected:
   virtual const char* GetName() const { return "entry"; }
 
  private:
   EntryFrame() { }
-  intptr_t ExitLinkOffset();
+  intptr_t ExitLinkOffset() const;
+  intptr_t SavedContextOffset() const;
 
   friend class StackFrameIterator;
   DISALLOW_COPY_AND_ASSIGN(EntryFrame);
 };
 
 
 // Iterator for iterating over all frames from the last ExitFrame to the
 // first EntryFrame.
 class StackFrameIterator : public ValueObject {
  public:
@@ skipping 120 matching lines @@
   uword pc_;
   GrowableArray<DeoptInstr*> deopt_instructions_;
   Array& object_table_;
 
   DISALLOW_COPY_AND_ASSIGN(InlinedFunctionsIterator);
 };
 
 }  // namespace dart
 
 #endif  // VM_STACK_FRAME_H_