Simplify flow graph building for instantiator.

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 43 matching lines @@
         num_stack_locals_(0) {
     ASSERT(function.IsZoneHandle());
   }
 
   const Function& function() const { return function_; }
   RawCode* code() const { return code_.raw(); }
 
   SequenceNode* node_sequence() const { return node_sequence_; }
   void SetNodeSequence(SequenceNode* node_sequence);
 
-  AstNode* instantiator() const { return instantiator_; }
-  void set_instantiator(AstNode* instantiator) {
+  LocalVariable* instantiator() const { return instantiator_; }
+  void set_instantiator(LocalVariable* 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.InVMHeap());
@@ skipping 41 matching lines @@
   int first_stack_local_index() const { return first_stack_local_index_; }
   int num_copied_params() const { return num_copied_params_; }
   int num_stack_locals() const { return num_stack_locals_; }
 
   void AllocateVariables();
 
  private:
   const Function& function_;
   Code& code_;
   SequenceNode* node_sequence_;
-  AstNode* instantiator_;
+  LocalVariable* instantiator_;
   Array& default_parameter_values_;
   LocalVariable* saved_current_context_var_;
   LocalVariable* saved_entry_context_var_;
   LocalVariable* expression_temp_var_;
   GrowableObjectArray* deferred_prefixes_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
@@ skipping 582 matching lines @@
   intptr_t last_used_try_index_;
 
   bool unregister_pending_function_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_