Removing more IC calls in optimized code.

runtime/vm/intermediate_language_x64.cc

Index: runtime/vm/intermediate_language_x64.cc
===================================================================
--- runtime/vm/intermediate_language_x64.cc	(revision 8921)
+++ runtime/vm/intermediate_language_x64.cc	(working copy)
@@ -315,6 +315,7 @@
   ASSERT(comp->HasICData());
   const ICData& ic_data = *comp->ic_data();
   ASSERT(ic_data.NumberOfChecks() > 0);
+  ASSERT(ic_data.num_args_tested() == 1);
   Label* deopt = compiler->AddDeoptStub(comp->cid(),
                                         comp->token_index(),
                                         comp->try_index(),
@@ -651,9 +652,48 @@
 }
 
 
+static void EmitLoadIndexedPolymorphic(FlowGraphCompiler* compiler,
+                                        LoadIndexedComp* comp) {
+  Label* deopt = compiler->AddDeoptStub(comp->cid(),
+                                        comp->token_index(),
+                                        comp->try_index(),
+                                        kDeoptLoadIndexedPolymorphic);
+  if (comp->ic_data()->NumberOfChecks() == 0) {
+    __ jmp(deopt);
+    return;
+  }
+  ASSERT(comp->HasICData());
+  const ICData& ic_data = *comp->ic_data();
+  ASSERT(ic_data.num_args_tested() == 1);
+  // No indexed access on Smi.
+  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmi);
+  // Load receiver into RAX.
+  const intptr_t kNumArguments = 2;
+  __ movq(RAX, Address(RSP, (kNumArguments - 1) * kWordSize));
+  __ testq(RAX, Immediate(kSmiTagMask));
+  __ j(ZERO, deopt);
+  Label done;
+  __ LoadClassId(RDI, RAX);
+  compiler->EmitTestAndCall(ic_data,
+                            RDI,  // Class id register.
+                            kNumArguments,
+                            Array::Handle(),  // No named arguments.
+                            deopt, &done,  // Labels.
+                            comp->cid(),
+                            comp->token_index(),
+                            comp->try_index());
+  __ Bind(&done);
+}
+
+
+
 void LoadIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
-    compiler->EmitLoadIndexedGeneric(this);
+    if (HasICData()) {
+      EmitLoadIndexedPolymorphic(compiler, this);
+    } else {
+      compiler->EmitLoadIndexedGeneric(this);
+    }
     ASSERT(locs()->out().reg() == RAX);
     return;
   }
@@ -748,14 +788,52 @@
                                  comp->try_index(),
                                  function_name,
                                  kNumArguments,
-                                 Array::ZoneHandle(),  // No optional arguments.
+                                 Array::ZoneHandle(),  // No names arguments.
                                  kNumArgsChecked);
 }
 
 
+static void EmitStoreIndexedPolymorphic(FlowGraphCompiler* compiler,
+                                        StoreIndexedComp* comp) {
+  Label* deopt = compiler->AddDeoptStub(comp->cid(),
+                                        comp->token_index(),
+                                        comp->try_index(),
+                                        kDeoptStoreIndexedPolymorphic);
+  if (comp->ic_data()->NumberOfChecks() == 0) {
+    __ jmp(deopt);
+    return;
+  }
+  ASSERT(comp->HasICData());
+  const ICData& ic_data = *comp->ic_data();
+  ASSERT(ic_data.num_args_tested() == 1);
+  // No indexed access on Smi.
+  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmi);
+  // Load receiver into RAX.
+  const intptr_t kNumArguments = 3;
+  __ movq(RAX, Address(RSP, (kNumArguments - 1) * kWordSize));
+  __ testq(RAX, Immediate(kSmiTagMask));
+  __ j(ZERO, deopt);
+  Label done;
+  __ LoadClassId(RDI, RAX);
+  compiler->EmitTestAndCall(ic_data,
+                            RDI,  // Class id register.
+                            kNumArguments,
+                            Array::Handle(),  // No named arguments.
+                            deopt, &done,  // Labels.
+                            comp->cid(),
+                            comp->token_index(),
+                            comp->try_index());
+  __ Bind(&done);
+}
+
+
 void StoreIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
-    EmitStoreIndexedGeneric(compiler, this);
+    if (HasICData()) {
+      EmitStoreIndexedPolymorphic(compiler, this);
+    } else {
+      EmitStoreIndexedGeneric(compiler, this);
+    }
     return;
   }
 
@@ -1774,12 +1852,16 @@
 
 void PolymorphicInstanceCallComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(instance_call()->VerifyComputation());
-  ASSERT(HasICData());
-  ASSERT(ic_data()->num_args_tested() == 1);
   Label* deopt = compiler->AddDeoptStub(instance_call()->cid(),
                                         instance_call()->token_index(),
                                         instance_call()->try_index(),
                                         kDeoptPolymorphicInstanceCallTestFail);
+  if (!HasICData() || (ic_data()->NumberOfChecks() == 0)) {
+    __ jmp(deopt);
+    return;
+  }
+  ASSERT(HasICData());
+  ASSERT(ic_data()->num_args_tested() == 1);
   Label handle_smi;
   Label* is_smi_label =
       ic_data()->GetReceiverClassIdAt(0) == kSmi ?  &handle_smi : deopt;
@@ -1790,21 +1872,14 @@
   __ j(ZERO, is_smi_label);
   Label done;
   __ LoadClassId(RDI, RAX);
-  for (intptr_t i = 0; i < ic_data()->NumberOfChecks(); i++) {
-    Label next_test;
-    __ cmpq(RDI, Immediate(ic_data()->GetReceiverClassIdAt(i)));
-    __ j(NOT_EQUAL, &next_test);
-    const Function& target = Function::ZoneHandle(ic_data()->GetTargetAt(i));
-    compiler->GenerateStaticCall(instance_call()->cid(),
-                                 instance_call()->token_index(),
-                                 instance_call()->try_index(),
-                                 target,
-                                 instance_call()->ArgumentCount(),
-                                 instance_call()->argument_names());
-    __ jmp(&done);
-    __ Bind(&next_test);
-  }
-  __ jmp(deopt);
+  compiler->EmitTestAndCall(*ic_data(),
+                            RDI,  // Class id register.
+                            instance_call()->ArgumentCount(),
+                            instance_call()->argument_names(),
+                            deopt, &done,  // Labels.
+                            instance_call()->cid(),
+                            instance_call()->token_index(),
+                            instance_call()->try_index());
   if (is_smi_label == &handle_smi) {
     __ Bind(&handle_smi);
     ASSERT(ic_data()->GetReceiverClassIdAt(0) == kSmi);