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

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
@@ skipping 149 matching lines @@
       // Transform to SSA (virtual register 0 and no inlining arguments).
       flow_graph->ComputeSSA(0, NULL);
       DEBUG_ASSERT(flow_graph->VerifyUseLists());
     }
 
     if (FLAG_print_flow_graph ||
         (optimized && FLAG_print_flow_graph_optimized)) {
       FlowGraphPrinter::PrintGraph("Before Optimizations", flow_graph);
     }
 
-    const ZoneGrowableArray<Field*>* guarded_fields = NULL;
-
+    // Collect all instance fields that are loaded in the graph and
+    // have non-generic type feedback attached to them that can
+    // potentially affect optimizations.
+    GrowableArray<Field*> guarded_fields(10);
     if (optimized) {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphoptimizer_timer,
                        isolate);
 
-      FlowGraphOptimizer optimizer(flow_graph);
+      FlowGraphOptimizer optimizer(flow_graph, &guarded_fields);
       optimizer.ApplyICData();
       DEBUG_ASSERT(flow_graph->VerifyUseLists());
 
       // Optimize (a << b) & c patterns. Must occur before
       // 'SelectRepresentations' which inserts conversion nodes.
       // TODO(srdjan): Moved before inlining until environment use list can
       // be used to detect when shift-left is outside the scope of bit-and.
       optimizer.TryOptimizeLeftShiftWithBitAndPattern();
       DEBUG_ASSERT(flow_graph->VerifyUseLists());
 
       // Inlining (mutates the flow graph)
       if (FLAG_use_inlining) {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphinliner_timer);
-        FlowGraphInliner inliner(flow_graph);
+        FlowGraphInliner inliner(flow_graph, &guarded_fields);
         inliner.Inline();
         // Use lists are maintained and validated by the inliner.
         DEBUG_ASSERT(flow_graph->VerifyUseLists());
       }
 
-      guarded_fields = flow_graph->FieldDependencies();
-
       // Propagate types and eliminate more type tests.
       if (FLAG_propagate_types) {
         FlowGraphTypePropagator propagator(flow_graph);
         propagator.Propagate();
         DEBUG_ASSERT(flow_graph->VerifyUseLists());
       }
 
       // Use propagated class-ids to optimize further.
       optimizer.ApplyClassIds();
       DEBUG_ASSERT(flow_graph->VerifyUseLists());
@@ skipping 108 matching lines @@
       graph_compiler.FinalizeStaticCallTargetsTable(code);
 
       if (optimized) {
         CodePatcher::PatchEntry(Code::Handle(function.CurrentCode()));
         function.SetCode(code);
         if (FLAG_trace_compiler) {
           OS::Print("--> patching entry %#"Px"\n",
                     Code::Handle(function.unoptimized_code()).EntryPoint());
         }
 
-        for (intptr_t i = 0; i < guarded_fields->length(); i++) {
-          const Field& field = *(*guarded_fields)[i];
+        for (intptr_t i = 0; i < guarded_fields.length(); i++) {
+          const Field& field = *guarded_fields[i];
           field.RegisterDependentCode(code);
         }
       } else {
         function.set_unoptimized_code(code);
         function.SetCode(code);
         ASSERT(CodePatcher::CodeIsPatchable(code));
       }
     }
     is_compiled = true;
   } else {
@@ skipping 347 matching lines @@
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart