Restore r20998 with a bug fix: add field to guarded_fields_ when it contains relevant cid. Was miss…

runtime/vm/flow_graph_inliner.h

Index: runtime/vm/flow_graph_inliner.h
===================================================================
--- runtime/vm/flow_graph_inliner.h	(revision 21001)
+++ runtime/vm/flow_graph_inliner.h	(working copy)
@@ -9,13 +9,14 @@
 
 namespace dart {
 
+class Field;
 class FlowGraph;
 template <typename T> class GrowableArray;
 
 class FlowGraphInliner : ValueObject {
  public:
-  explicit FlowGraphInliner(FlowGraph* flow_graph)
-      : flow_graph_(flow_graph) {}
+  FlowGraphInliner(FlowGraph* flow_graph, GrowableArray<Field*>* guarded_fields)
+      : flow_graph_(flow_graph), guarded_fields_(guarded_fields) {}
 
   // The flow graph is destructively updated upon inlining.
   void Inline();
@@ -24,6 +25,8 @@
 
  private:
   FlowGraph* flow_graph_;
+  GrowableArray<Field*>* guarded_fields_;
+
   DISALLOW_COPY_AND_ASSIGN(FlowGraphInliner);
 };