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

runtime/vm/parser.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_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
@@ skipping 19 matching lines @@
 // The class ParsedFunction holds the result of parsing a function.
 class ParsedFunction : public ZoneAllocated {
  public:
   static const int kFirstLocalSlotIndex = -2;
 
   explicit ParsedFunction(const Function& function)
       : function_(function),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::ZoneHandle()),
+        saved_current_context_var_(NULL),
         saved_entry_context_var_(NULL),
         expression_temp_var_(NULL),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         num_copied_params_(0),
         num_stack_locals_(0) {
     ASSERT(function.IsZoneHandle());
   }
 
   const Function& function() const { return function_; }
 
   SequenceNode* node_sequence() const { return node_sequence_; }
   void SetNodeSequence(SequenceNode* node_sequence);
 
   AstNode* instantiator() const { return instantiator_; }
   void set_instantiator(AstNode* instantiator) {
     // May be NULL.
     instantiator_ = instantiator;
   }
 
   const Array& default_parameter_values() const {
     return default_parameter_values_;
   }
   void set_default_parameter_values(const Array& default_parameter_values) {
     ASSERT(default_parameter_values.IsZoneHandle());
     default_parameter_values_ = default_parameter_values.raw();
   }
 
+  LocalVariable* saved_current_context_var() const {
+    return saved_current_context_var_;
+  }
+  void set_saved_current_context_var(LocalVariable* saved_current_context_var) {
+    ASSERT(saved_current_context_var != NULL);
+    saved_current_context_var_ = saved_current_context_var;
+  }
+
   LocalVariable* saved_entry_context_var() const {
     return saved_entry_context_var_;
   }
   void set_saved_entry_context_var(LocalVariable* saved_entry_context_var) {
     ASSERT(saved_entry_context_var != NULL);
     saved_entry_context_var_ = saved_entry_context_var;
   }
 
   // Returns NULL if this function does not save the arguments descriptor on
   // entry.
@@ skipping 17 matching lines @@
   int num_copied_params() const { return num_copied_params_; }
   int num_stack_locals() const { return num_stack_locals_; }
 
   void AllocateVariables();
 
  private:
   const Function& function_;
   SequenceNode* node_sequence_;
   AstNode* instantiator_;
   Array& default_parameter_values_;
+  LocalVariable* saved_current_context_var_;
   LocalVariable* saved_entry_context_var_;
   LocalVariable* expression_temp_var_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
@@ skipping 517 matching lines @@
 
   // Allocate temporary only once per function.
   LocalVariable* expression_temp_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_