VM-codegen: For polymorphic methods don't expand Cids at call sites

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/bootstrap.h"
 #include "vm/compiler.h"
 #include "vm/constant_propagator.h"
@@ skipping 2931 matching lines @@
 
   Function& fn = Function::Handle(zone);
 
   intptr_t length = targets.length();
 
   // Spread class-ids to preceding classes where a lookup yields the same
   // method.
   for (int idx = 0; idx < length; idx++) {
     int lower_limit_cid = (idx == 0) ? -1 : targets[idx - 1].cid_end;
     const Function& target = *targets.TargetAt(idx)->target;
+    if (MethodRecognizer::PolymorphicTarget(target)) continue;
     for (int i = targets[idx].cid_start - 1; i > lower_limit_cid; i--) {
       if (FlowGraphCompiler::LookupMethodFor(i, name, args_desc, &fn) &&
           fn.raw() == target.raw()) {
         targets[idx].cid_start = i;
       } else {
         break;
       }
     }
   }
   // Spread class-ids to following classes where a lookup yields the same
   // method.
   for (int idx = 0; idx < length; idx++) {
     int upper_limit_cid =
         (idx == length - 1) ? 1000000000 : targets[idx + 1].cid_start;
     const Function& target = *targets.TargetAt(idx)->target;
+    if (MethodRecognizer::PolymorphicTarget(target)) continue;
     for (int i = targets[idx].cid_end + 1; i < upper_limit_cid; i++) {
       if (FlowGraphCompiler::LookupMethodFor(i, name, args_desc, &fn) &&
           fn.raw() == target.raw()) {
         targets[idx].cid_end = i;
       } else {
         break;
       }
     }
   }
   targets.MergeIntoRanges();

[Vyacheslav Egorov (Google), 2017/06/23 16:09:46]

This will merge stuff together if you have two polymorphic targets that have
adjacent receiver cids.

I think you need to guard in the same way there. 

[erikcorry, 2017/06/23 17:10:22]

Done.

   return &targets;
 }
 
 
 void CallTargets::MergeIntoRanges() {
   // Merge adjacent class id ranges.
   int dest = 0;
   for (int src = 1; src < length(); src++) {
     if (TargetAt(dest)->cid_end + 1 >= TargetAt(src)->cid_start &&
         TargetAt(dest)->target->raw() == TargetAt(src)->target->raw()) {
@@ skipping 1372 matching lines @@
                      "native function '%s' (%" Pd " arguments) cannot be found",
                      native_name().ToCString(), function().NumParameters());
   }
   set_is_auto_scope(auto_setup_scope);
   set_native_c_function(native_function);
 }
 
 #undef __
 
 }  // namespace dart