Fix bug with CHA dependencies by recording a set of classes for registering code.

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/block_scheduler.h"
+#include "vm/cha.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/deopt_instructions.h"
 #include "vm/exceptions.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 224 matching lines @@
                                         bool optimized,
                                         intptr_t osr_id) {
   const Function& function = parsed_function->function();
   if (optimized && !function.IsOptimizable()) {
     return false;
   }
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::codegen_timer);
   bool is_compiled = false;
   Isolate* isolate = Isolate::Current();
   HANDLESCOPE(isolate);
-  isolate->set_cha_used(false);
 
   // We may reattempt compilation if the function needs to be assembled using
   // far branches on ARM and MIPS. In the else branch of the setjmp call,
   // done is set to false, and use_far_branches is set to true if there is a
   // longjmp from the ARM or MIPS assemblers. In all other paths through this
   // while loop, done is set to true. use_far_branches is always false on ia32
   // and x64.
   bool done = false;
   // volatile because the variable may be clobbered by a longjmp.
   volatile bool use_far_branches = false;
   while (!done) {
     const intptr_t prev_deopt_id = isolate->deopt_id();
     isolate->set_deopt_id(0);
     LongJumpScope jump;
     if (setjmp(*jump.Set()) == 0) {
       FlowGraph* flow_graph = NULL;
+
+      // Class hierarchy analysis is registered with the isolate in the
+      // constructor and unregisters itself upon destruction.
+      CHA cha(isolate);
+
       // TimerScope needs an isolate to be properly terminated in case of a
       // LongJump.
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphbuilder_timer,
                          isolate);
         ZoneGrowableArray<const ICData*>* ic_data_array =
             new(isolate) ZoneGrowableArray<const ICData*>();
         if (optimized) {
           ASSERT(function.HasCode());
           // Extract type feedback before the graph is built, as the graph
           // builder uses it to attach it to nodes.
           ASSERT(function.deoptimization_counter() <
                  FLAG_deoptimization_counter_threshold);
           function.RestoreICDataMap(ic_data_array);
         }
 
+
         // Build the flow graph.
         FlowGraphBuilder builder(parsed_function,
                                  *ic_data_array,
                                  NULL,  // NULL = not inlining.
                                  osr_id,
                                  optimized);
         flow_graph = builder.BuildGraph();
       }
 
       if (FLAG_print_flow_graph ||
@@ skipping 239 matching lines @@
                          isolate);
         graph_compiler.CompileGraph();
       }
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::codefinalizer_timer,
                          isolate);
         const Code& code = Code::Handle(
             Code::FinalizeCode(function, &assembler, optimized));
         code.set_is_optimized(optimized);
-        // CHA should not be used for unoptimized code.
-        ASSERT(optimized || !isolate->cha_used());
-        if (isolate->cha_used()) {
-          Class::Handle(function.Owner()).RegisterCHACode(code);
-          isolate->set_cha_used(false);
-        }
         graph_compiler.FinalizePcDescriptors(code);
         graph_compiler.FinalizeDeoptInfo(code);
         graph_compiler.FinalizeStackmaps(code);
         graph_compiler.FinalizeVarDescriptors(code);
         graph_compiler.FinalizeExceptionHandlers(code);
         graph_compiler.FinalizeStaticCallTargetsTable(code);
 
         if (optimized) {
           if (osr_id == Isolate::kNoDeoptId) {
             CodePatcher::PatchEntry(Code::Handle(function.CurrentCode()));
             if (FLAG_trace_compiler || FLAG_trace_patching) {
               if (FLAG_trace_compiler) {
                 OS::Print("  ");
               }
               OS::Print("Patch unoptimized '%s' entry point %#" Px "\n",
                   function.ToFullyQualifiedCString(),
                   Code::Handle(function.unoptimized_code()).EntryPoint());
             }
           }
           function.AttachCode(code);
 
+          // Register code with the classes it depends on because of CHA.
+          for (intptr_t i = 0;
+               i < isolate->cha()->cha_classes().length();
+               ++i) {
+            isolate->cha()->cha_classes()[i]->RegisterCHACode(code);

[Florian Schneider, 2014/08/12 11:37:10]

This fixes bug #2: The optimized code is now registered with a set of classes
recorded in CHA during compilation.

+          }
+
           for (intptr_t i = 0;
                i < flow_graph->guarded_fields()->length();
                i++) {
             const Field* field = (*flow_graph->guarded_fields())[i];
             field->RegisterDependentCode(code);
           }
         } else {  // not optimized.
           if (function.ic_data_array() == Array::null()) {
             function.SaveICDataMap(graph_compiler.deopt_id_to_ic_data());
           }
@@ skipping 388 matching lines @@
     const Object& result =
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart