VM: [Kernel] Ensure we record [FieldLoadInstr]s in the ParsedFunction when using field guards

runtime/vm/flow_graph_builder.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_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/compiler.h"
@@ skipping 3396 matching lines @@
       BuildStoreLocal(node->local(), store_value, node->token_pos());
   ReturnDefinition(store);
 }
 
 
 void EffectGraphVisitor::VisitLoadInstanceFieldNode(
     LoadInstanceFieldNode* node) {
   ValueGraphVisitor for_instance(owner());
   node->instance()->Visit(&for_instance);
   Append(for_instance);
-  LoadFieldInstr* load = new (Z) LoadFieldInstr(
-      for_instance.value(), &node->field(),
-      AbstractType::ZoneHandle(Z, node->field().type()), node->token_pos());
-  if (node->field().guarded_cid() != kIllegalCid) {
-    if (!node->field().is_nullable() ||
-        (node->field().guarded_cid() == kNullCid)) {
-      load->set_result_cid(node->field().guarded_cid());
-    }
-    owner()->parsed_function().AddToGuardedFields(&node->field());
-  }
+  LoadFieldInstr* load =
+      new (Z) LoadFieldInstr(for_instance.value(), &node->field(),
+                             AbstractType::ZoneHandle(Z, node->field().type()),
+                             node->token_pos(), &owner()->parsed_function());
   ReturnDefinition(load);
 }
 
 
 void EffectGraphVisitor::VisitStoreInstanceFieldNode(
     StoreInstanceFieldNode* node) {
   const TokenPosition token_pos = node->token_pos();
   ValueGraphVisitor for_instance(owner());
   node->instance()->Visit(&for_instance);
   Append(for_instance);
@@ skipping 947 matching lines @@
       graph_entry_->PruneUnreachable(graph_entry_, NULL, osr_id_, block_marks);
   ASSERT(found);
 }
 
 
 void FlowGraphBuilder::Bailout(const char* reason) const {
   parsed_function_.Bailout("FlowGraphBuilder", reason);
 }
 
 }  // namespace dart