Clean-up CodeGenState: remove unused loop_level and move context_level to CodeGenerator (and add it…

runtime/vm/code_generator_x64.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_CODE_GENERATOR_X64_H_
 #define VM_CODE_GENERATOR_X64_H_
 
 #ifndef VM_CODE_GENERATOR_H_
 #error Do not include code_generator_x64.h directly; use code_generator.h.
 #endif
@@ skipping 18 matching lines @@
   virtual ~CodeGeneratorState();
 
   CodeGeneratorState* parent() const { return parent_; }
 
   AstNode* root_node() const { return root_node_; }
   void set_root_node(AstNode* value) { root_node_ = value; }
   bool IsRootNode(AstNode* node) const {
     return root_node_ == node;
   }
 
-  int loop_level() const { return loop_level_; }
-  void set_loop_level(int loop_level) {
-    loop_level_ = loop_level;
-  }
-
-  int context_level() const { return context_level_; }
-  void set_context_level(int context_level) {
-    context_level_ = context_level;
-  }
-
   int try_index() const { return current_try_index_; }
   void set_try_index(int value) {
     current_try_index_ = value;
   }
 
  private:
   CodeGenerator* codegen_;
   CodeGeneratorState* parent_;
   AstNode* root_node_;
 
-  // The loop level reflects the lexical nesting of loop statements, regardless
-  // of the presence of captured variables.
-  int loop_level_;
-
-  // The runtime context level is only incremented when a new context is
-  // allocated and chained to the list of contexts. This occurs when the scopes
-  // at the current loop level contain captured variables.
-  int context_level_;
-
   // We identify each try block in this function with an unique 'try index'
   // value.
   // The 'try index' is used to match the try blocks with the corresponding
   // catch block (if one exists). The PC descriptors generated for
   // statements in the try block use this index so that it can be matched
   // to the appropriate catch block.
   // The 'try index' value is generated by incrementing the try_index_
   // variable in the CodeGenerator object.
   // We store the 'try index' of the block of code that we are
   // currently generating code for in the current_try_index_ variable.
@@ skipping 139 matching lines @@
   void ErrorMsg(intptr_t token_index, const char* format, ...);
 
   int generate_next_try_index() { return try_index_ += 1; }
 
   void MarkDeoptPoint(intptr_t node_id, intptr_t token_index);
   void AddCurrentDescriptor(PcDescriptors::Kind kind,
                             intptr_t node_id,
                             intptr_t token_index);
   void CopyParameters();
 
+  void set_context_level(intptr_t value) { context_level_ = value; }
+  intptr_t context_level() const { return context_level_; }
+
   Assembler* assembler_;
   const ParsedFunction& parsed_function_;
   intptr_t locals_space_size_;
   CodeGeneratorState* state_;
   DescriptorList* pc_descriptors_list_;
   HandlerList* exception_handlers_list_;
   int try_index_;
+  // The runtime context level is only incremented when a new context is
+  // allocated and chained to the list of contexts.
+  intptr_t context_level_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(CodeGenerator);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_CODE_GENERATOR_X64_H_