Clean up handling of guarded fields in the flow graph builder.

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/growable_array.h"
 #include "vm/intermediate_language.h"
 #include "vm/parser.h"
@@ skipping 179 matching lines @@
   ZoneGrowableArray<BitVector*>* loop_invariant_loads() const {
     return loop_invariant_loads_;
   }
   void set_loop_invariant_loads(
       ZoneGrowableArray<BitVector*>* loop_invariant_loads) {
     loop_invariant_loads_ = loop_invariant_loads;
   }
 
   bool IsCompiledForOsr() const { return graph_entry()->IsCompiledForOsr(); }
 
+  static void AddToGuardedFields(const Field* field,

[Kevin Millikin (Google), 2013/09/20 12:04:28]

I like reversing the arguments here, because it matches (target, source) that we
use in a lot of other places.

[Florian Schneider, 2013/09/20 12:13:50]

Done.

+                                 ZoneGrowableArray<const Field*>* array);
+
+  ZoneGrowableArray<const Field*>* guarded_fields() const {
+    return guarded_fields_;
+  }
+
  private:
   friend class IfConverter;
   friend class BranchSimplifier;
   friend class ConstantPropagator;
 
   // SSA transformation methods and fields.
   void ComputeDominators(GrowableArray<BitVector*>* dominance_frontier);
 
   void CompressPath(
       intptr_t start_index,
@@ skipping 52 matching lines @@
   GrowableArray<BlockEntryInstr*> optimized_block_order_;
   ConstantInstr* constant_null_;
 
   BlockEffects* block_effects_;
   bool licm_allowed_;
 
   bool use_far_branches_;
 
   ZoneGrowableArray<BlockEntryInstr*>* loop_headers_;
   ZoneGrowableArray<BitVector*>* loop_invariant_loads_;
+  ZoneGrowableArray<const Field*>* guarded_fields_;
 };
 
 
 class LivenessAnalysis : public ValueObject {
  public:
   LivenessAnalysis(intptr_t variable_count,
                    const GrowableArray<BlockEntryInstr*>& postorder);
 
   void Analyze();
 
@@ skipping 85 matching lines @@
   // Per block sets of available blocks. Block A is available at the block B if
   // and only if A dominates B and all paths from A to B are free of side
   // effects.
   GrowableArray<BitVector*> available_at_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_