VM: Generalize using propagated cids for to >1 arguments.

runtime/vm/flow_graph_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/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 92 matching lines @@
     // This occurs when an instance call has too many checks.
     // TODO(srdjan): Replace IC call with megamorphic call.
     return false;
   }
   GrowableArray<intptr_t> class_ids(call->ic_data()->num_args_tested());
   ASSERT(call->ic_data()->num_args_tested() <= call->ArgumentCount());
   for (intptr_t i = 0; i < call->ic_data()->num_args_tested(); i++) {
     intptr_t cid = call->PushArgumentAt(i)->value()->Type()->ToCid();
     class_ids.Add(cid);
   }
-  // TODO(srdjan): Test for number of arguments checked greater than 1.
-  if (class_ids.length() != 1) {
-    return false;
-  }
   if (class_ids[0] != kDynamicCid) {
     ArgumentsDescriptor args_desc(
         Array::Handle(ArgumentsDescriptor::New(call->ArgumentCount(),
                                                call->argument_names())));
     const Class& receiver_class = Class::Handle(
         Isolate::Current()->class_table()->At(class_ids[0]));
     const Function& function = Function::Handle(
         Resolver::ResolveDynamicForReceiverClass(
             receiver_class,
             call->function_name(),
             args_desc));
     if (function.IsNull()) {
       return false;
     }
     // Create new ICData, do not modify the one attached to the instruction
     // since it is attached to the assembly instruction itself.
     // TODO(srdjan): Prevent modification of ICData object that is
     // referenced in assembly code.
     ICData& ic_data = ICData::ZoneHandle(ICData::New(
         flow_graph_->parsed_function().function(),
         call->function_name(),
         Object::empty_array(),  // Dummy argument descriptor.
         call->deopt_id(),
         class_ids.length()));
-    ic_data.AddReceiverCheck(class_ids[0], function);
+    if (class_ids.length() > 1) {
+      ic_data.AddCheck(class_ids, function);
+    } else {
+      ASSERT(class_ids.length() == 1);
+      ic_data.AddReceiverCheck(class_ids[0], function);
+    }
     call->set_ic_data(&ic_data);
     return true;
   }
   return false;
 }
 
 
 static const ICData& SpecializeICData(const ICData& ic_data, intptr_t cid) {
   ASSERT(ic_data.num_args_tested() == 1);
 
@@ skipping 7893 matching lines @@
   }
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, alloc->cls(), *fields);
   }
 }
 
 
 }  // namespace dart