More ICData cleanups: try to use ICData instead of converting it to another intermediate representa…

runtime/vm/flow_graph_builder.cc

Index: runtime/vm/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc	(revision 8871)
+++ runtime/vm/flow_graph_builder.cc	(working copy)
@@ -189,8 +189,9 @@
       AddInstruction(load);
       context_value = new UseVal(load);
     }
-    return new LoadVMFieldComp(
-        context_value, Context::variable_offset(local.index()), local.type());
+    return new LoadVMFieldComp(context_value,
+                               Context::variable_offset(local.index()),
+                               local.type());
   } else {
     return new LoadLocalComp(local, owner()->context_level());
   }
@@ -1901,7 +1902,7 @@
   node->instance()->Visit(&for_instance);
   Append(for_instance);
   LoadInstanceFieldComp* load = new LoadInstanceFieldComp(
-      node->field(), for_instance.value(), NULL, NULL);
+      node->field(), for_instance.value(), NULL);
   ReturnComputation(load);
 }
 
@@ -1924,7 +1925,7 @@
                                        dst_name);
   }
   StoreInstanceFieldComp* store = new StoreInstanceFieldComp(
-      node->field(), for_instance.value(), store_value, NULL, NULL);
+      node->field(), for_instance.value(), store_value, NULL);
   ReturnComputation(store);
 }