Background compiler should validate CHA decisions before committing the code.

runtime/vm/aot_optimizer.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/aot_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/branch_optimizer.h"
 #include "vm/cha.h"
 #include "vm/compiler.h"
@@ skipping 2049 matching lines @@
 
   // Private classes cannot be subclassed by later loaded libs.
   if (!type_class.IsPrivate()) {
     if (FLAG_use_cha_deopt || isolate()->all_classes_finalized()) {
       if (FLAG_trace_cha) {
         THR_Print("  **(CHA) Typecheck as class equality since no "
             "subclasses: %s\n",
             type_class.ToCString());
       }
       if (FLAG_use_cha_deopt) {
-        thread()->cha()->AddToLeafClasses(type_class);
+        thread()->cha()->AddToGuardedClasses(type_class, /*subclass_count=*/0);

[Florian Schneider, 2016/05/20 11:23:28]

You can remove this, or add ASSERT(!FLAG_use_cha_deopt) here. This should never
be reached, since use_cha_deopt is hardcoded to false for AOT.

[Vyacheslav Egorov (Google), 2016/05/20 11:31:21]

Done.

       }
     } else {
       return false;
     }
   }
   const intptr_t num_type_args = type_class.NumTypeArguments();
   if (num_type_args > 0) {
     // Only raw types can be directly compared, thus disregarding type
     // arguments.
     const intptr_t num_type_params = type_class.NumTypeParameters();
@@ skipping 368 matching lines @@
     const Array& args_desc_array = Array::Handle(Z,
         ArgumentsDescriptor::New(instr->ArgumentCount(),
                                  instr->argument_names()));
     ArgumentsDescriptor args_desc(args_desc_array);
     const Function& function = Function::Handle(Z,
         Resolver::ResolveDynamicForReceiverClass(
             receiver_class,
             instr->function_name(),
             args_desc));
     if (!function.IsNull()) {
+      intptr_t subclasses = 0;
       if (!thread()->cha()->HasOverride(receiver_class,
-                                        instr->function_name())) {
+                                        instr->function_name(),
+                                        &subclasses)) {
         if (FLAG_trace_cha) {
           THR_Print("  **(CHA) Instance call needs no check, "
               "no overrides of '%s' '%s'\n",
               instr->function_name().ToCString(), receiver_class.ToCString());
         }
 
         // Create fake IC data with the resolved target.
         const ICData& ic_data = ICData::Handle(
             ICData::New(flow_graph_->function(),
                         instr->function_name(),
@@ skipping 305 matching lines @@
 
   // Discard the environment from the original instruction because the store
   // can't deoptimize.
   instr->RemoveEnvironment();
   ReplaceCall(instr, store);
   return true;
 }
 
 
 }  // namespace dart