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

runtime/vm/flow_graph.cc

 // 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.
 
 #include "vm/flow_graph.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 677 matching lines @@
   for (intptr_t i = 1; i < preorder_.length(); ++i) {
     for (ForwardInstructionIterator it(preorder_[i]);
          !it.Done();
          it.Advance()) {
       ++size;
     }
   }
   return size;
 }
 
-
-const ZoneGrowableArray<Field*>* FlowGraph::FieldDependencies() const {
-  ZoneGrowableArray<Field*>* result = new ZoneGrowableArray<Field*>(10);
-
-  for (intptr_t i = 1; i < reverse_postorder().length(); i++) {
-    BlockEntryInstr* entry = reverse_postorder()[i];
-    for (ForwardInstructionIterator it(entry); !it.Done(); it.Advance()) {
-      LoadFieldInstr* load_field = it.Current()->AsLoadField();
-      if (load_field == NULL) {
-        continue;
-      }
-
-      Field* field = load_field->field();
-      if ((field == NULL) ||
-          (field->guarded_cid() == kDynamicCid) ||
-          (field->guarded_cid() == kIllegalCid)) {
-        continue;
-      }
-
-      bool found = false;
-      for (intptr_t j = 0; j < result->length(); j++) {
-        if ((*result)[j]->raw() == field->raw()) {
-          found = true;
-          break;
-        }
-      }
-
-      if (!found) {
-        result->Add(field);
-      }
-    }
-  }
-
-  return result;
-}
-
 }  // namespace dart