Make CTX allocatable by the register allocator.

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 "platform/assert.h"
@@ skipping 26 matching lines @@
 
 // The class ParsedFunction holds the result of parsing a function.
 class ParsedFunction : public ZoneAllocated {
  public:
   ParsedFunction(Isolate* isolate, const Function& function)
       : function_(function),
         code_(Code::Handle(isolate, function.unoptimized_code())),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::ZoneHandle(isolate, Array::null())),
-        saved_current_context_var_(NULL),
+        current_context_var_(NULL),
         saved_entry_context_var_(NULL),
         expression_temp_var_(NULL),
         finally_return_temp_var_(NULL),
         deferred_prefixes_(new ZoneGrowableArray<const LibraryPrefix*>()),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         num_copied_params_(0),
         num_stack_locals_(0),
         have_seen_await_expr_(false),
         saved_try_ctx_(NULL),
@@ skipping 16 matching lines @@
 
   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.InVMHeap());
     default_parameter_values_ = default_parameter_values.raw();
   }
 
-  LocalVariable* saved_current_context_var() const {
-    return saved_current_context_var_;
+  LocalVariable* current_context_var() const {
+    return 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;
+  void set_current_context_var(LocalVariable* current_context_var) {
+    ASSERT(current_context_var != NULL);
+    current_context_var_ = current_context_var;
   }
-  bool has_saved_current_context_var() const {
-    return saved_current_context_var_ != NULL;
+  bool has_current_context_var() const {
+    return current_context_var_ != NULL;
   }
 
   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;
   }
 
@@ skipping 15 matching lines @@
   }
   void set_finally_return_temp_var(LocalVariable* value) {
     ASSERT(!has_finally_return_temp_var());
     finally_return_temp_var_ = value;
   }
   bool has_finally_return_temp_var() const {
     return finally_return_temp_var_ != NULL;
   }
   void EnsureFinallyReturnTemp();
 
-  static LocalVariable* CreateExpressionTempVar(intptr_t token_pos);
   LocalVariable* EnsureExpressionTemp();
+  LocalVariable* EnsureSavedCurrentContext();
 
   bool HasDeferredPrefixes() const { return deferred_prefixes_->length() != 0; }
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes() const {
     return deferred_prefixes_;
   }
   void AddDeferredPrefix(const LibraryPrefix& prefix);
 
   int first_parameter_index() const { return first_parameter_index_; }
   int first_stack_local_index() const { return first_stack_local_index_; }
   int num_copied_params() const { return num_copied_params_; }
@@ skipping 26 matching lines @@
   }
 
   Isolate* isolate() const { return isolate_; }
 
  private:
   const Function& function_;
   Code& code_;
   SequenceNode* node_sequence_;
   LocalVariable* instantiator_;
   Array& default_parameter_values_;
-  LocalVariable* saved_current_context_var_;
+  LocalVariable* current_context_var_;
   LocalVariable* saved_entry_context_var_;
   LocalVariable* expression_temp_var_;
   LocalVariable* finally_return_temp_var_;
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
   bool have_seen_await_expr_;
@@ skipping 540 matching lines @@
                                   const Function* func);
 
   void SetupSavedTryContext(LocalVariable* saved_try_context);
   void RestoreSavedTryContext(LocalScope* saved_try_context_scope,
                               int16_t try_index,
                               SequenceNode* target);
 
   void CheckOperatorArity(const MemberDesc& member);
 
   void EnsureExpressionTemp();
+  void EnsureContextVar();
   void EnsureSavedCurrentContext();
   bool IsLegalAssignableSyntax(AstNode* expr, intptr_t end_pos);
   AstNode* CreateAssignmentNode(AstNode* original,
                                 AstNode* rhs,
                                 const String* left_ident,
                                 intptr_t left_pos);
   AstNode* InsertClosureCallNodes(AstNode* condition);
 
   ConstructorCallNode* CreateConstructorCallNode(
       intptr_t token_pos,
@@ skipping 67 matching lines @@
   bool unregister_pending_function_;
 
   LocalScope* async_temp_scope_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_