Cleanup access to guarded_fields

runtime/vm/flow_graph_inliner.cc

 // 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.
 
 #include "vm/flow_graph_inliner.h"
 
 #include "vm/block_scheduler.h"
 #include "vm/branch_optimizer.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
@@ skipping 863 matching lines @@
           inlined_recursive_call_ = true;
         }
         thread()->set_deopt_id(prev_deopt_id);
 
         call_data->callee_graph = callee_graph;
         call_data->parameter_stubs = param_stubs;
         call_data->exit_collector = exit_collector;
 
         // When inlined, we add the guarded fields of the callee to the caller's
         // list of guarded fields.
-        for (intptr_t i = 0;
-             i < callee_graph->guarded_fields()->length();
-             ++i) {
-          FlowGraph::AddToGuardedFields(caller_graph_->guarded_fields(),
-                                        (*callee_graph->guarded_fields())[i]);
+        const ZoneGrowableArray<const Field*>& callee_guarded_fields =
+            *callee_graph->parsed_function().guarded_fields();
+        for (intptr_t i = 0; i < callee_guarded_fields.length(); ++i) {
+          caller_graph()->
+              parsed_function().AddToGuardedFields(callee_guarded_fields[i]);
         }
         // When inlined, we add the deferred prefixes of the callee to the
         // caller's list of deferred prefixes.
         caller_graph()->AddToDeferredPrefixes(
             callee_graph->deferred_prefixes());
 
         FlowGraphInliner::SetInliningId(callee_graph,
             inliner_->NextInlineId(callee_graph->function(),
                                    call_data->caller_inlining_id_));
         TRACE_INLINING(THR_Print("     Success\n"));
@@ skipping 2149 matching lines @@
       return InlineDoubleOp(flow_graph, Token::kMUL, call, entry, last);
     case MethodRecognizer::kDoubleDiv:
       return InlineDoubleOp(flow_graph, Token::kDIV, call, entry, last);
     default:
       return false;
   }
 }
 
 
 }  // namespace dart