Adapt compile time constants and integrate with Kevin's CL 10302007 (Remove temporaries using expli…

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 18 matching lines @@
 
 // The class ParsedFunction holds the result of parsing a function.
 class ParsedFunction : ValueObject {
  public:
   explicit ParsedFunction(const Function& function)
       : function_(function),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::Handle()),
         saved_context_var_(NULL),
+        expression_temp_var_(NULL),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         copied_parameter_count_(0),
         stack_local_count_(0) { }
 
   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) {
     default_parameter_values_ = default_parameter_values.raw();
   }
 
   LocalVariable* saved_context_var() const { return saved_context_var_; }
   void set_saved_context_var(LocalVariable* saved_context_var) {
     ASSERT(saved_context_var != NULL);
     saved_context_var_ = saved_context_var;
   }
 
+  LocalVariable* expression_temp_var() const {
+    ASSERT(has_expression_temp_var());
+    return expression_temp_var_;
+  }
+  void set_expression_temp_var(LocalVariable* value) {
+    ASSERT(!has_expression_temp_var());
+    expression_temp_var_ = value;
+  }
+  bool has_expression_temp_var() const {
+    return expression_temp_var_ != NULL;
+  }
+  static LocalVariable* CreateExpressionTempVar(intptr_t token_index);
+
   int first_parameter_index() const { return first_parameter_index_; }
   int first_stack_local_index() const { return first_stack_local_index_; }
   int copied_parameter_count() const { return copied_parameter_count_; }
   int stack_local_count() const { return stack_local_count_; }
 
   void AllocateVariables();
 
  private:
   const Function& function_;
   SequenceNode* node_sequence_;
   AstNode* instantiator_;
   Array& default_parameter_values_;
   LocalVariable* saved_context_var_;
+  LocalVariable* expression_temp_var_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int copied_parameter_count_;
   int stack_local_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
 
 
@@ skipping 370 matching lines @@
                           const char* function_name,
                           ArgumentListNode* arguments);
   String& Interpolate(ArrayNode* values);
   AstNode* MakeAssertCall(intptr_t begin, intptr_t end);
   AstNode* ThrowTypeError(intptr_t type_pos, const AbstractType& type);
 
   void CheckFunctionIsCallable(intptr_t token_index, const Function& function);
   void CheckOperatorArity(const MemberDesc& member, Token::Kind operator_token);
 
   const LocalVariable& GetIncrementTempLocal();
+  void EnsureExpressionTemp();
 
   const Script& script_;
   const TokenStream& tokens_;
   intptr_t token_index_;
   Token::Kind token_kind_;  // Cached token kind for the token_index_.
   Block* current_block_;
 
   // is_top_level_ is true if parsing the "top level" of a compilation unit,
   // that is interface and class definitions.
   bool is_top_level_;
@@ skipping 15 matching lines @@
 
   // The current library (and thus class dictionary) used to resolve names.
   const Library& library_;
 
   // List of try blocks seen so far, this is used to generate inlined finally
   // code at all points in the try block where an exit from the block is
   // done using 'return', 'break' or 'continue' statements.
   TryBlocks* try_blocks_list_;
 
   // Allocate temporary only once per function.
-  LocalVariable* increment_temp_;
+  LocalVariable* expression_temp_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_