Cleanup: remove flow-graph's cached copy of num stack locals as it can become stale if variables ge…

runtime/vm/flow_graph.h

 // Copyright (c) 2013, 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_FLOW_GRAPH_H_
 #define VM_FLOW_GRAPH_H_
 
 #include "vm/bit_vector.h"
 #include "vm/growable_array.h"
 #include "vm/hash_map.h"
@@ skipping 81 matching lines @@
   }
 
   // Function properties.
   ParsedFunction& parsed_function() const {
     return parsed_function_;
   }
   intptr_t parameter_count() const {
     return num_copied_params_ + num_non_copied_params_;
   }
   intptr_t variable_count() const {
-    return parameter_count() + num_stack_locals_;
+    return parameter_count() + num_stack_locals();
   }
   intptr_t num_stack_locals() const {
-    return num_stack_locals_;
+    return parsed_function().num_stack_locals();
   }
   intptr_t num_copied_params() const {
     return num_copied_params_;
   }
   intptr_t num_non_copied_params() const {
     return num_non_copied_params_;
   }
 
   LocalVariable* CurrentContextVar() const {
     return parsed_function().current_context_var();
@@ skipping 216 matching lines @@
   GrowableArray<BitVector*> assigned_vars_;
 
   intptr_t current_ssa_temp_index_;
   intptr_t max_block_id_;
 
   // Flow graph fields.
   const FlowGraphBuilder& builder_;
   ParsedFunction& parsed_function_;
   const intptr_t num_copied_params_;
   const intptr_t num_non_copied_params_;
-  const intptr_t num_stack_locals_;
   GraphEntryInstr* graph_entry_;
   GrowableArray<BlockEntryInstr*> preorder_;
   GrowableArray<BlockEntryInstr*> postorder_;
   GrowableArray<BlockEntryInstr*> reverse_postorder_;
   GrowableArray<BlockEntryInstr*> optimized_block_order_;
   ConstantInstr* constant_null_;
   ConstantInstr* constant_dead_;
   ConstantInstr* constant_empty_context_;
 
   BlockEffects* block_effects_;
@@ skipping 153 matching lines @@
 
  private:
   GrowableArray<Definition*> defs_;
   BitVector* contains_vector_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_