Improve code for checked instance calls (polymorphic calls) and expand printing of PolymorphicInsta…

runtime/vm/intermediate_language_x64.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/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 659 matching lines @@
   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.
+                            deopt,  // Deoptimize target.
+                            NULL,   // Fallthrough when done.
                             comp->cid(),
                             comp->token_pos(),
                             comp->try_index());
-  __ Bind(&done);
 }
 
 
 void LoadIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
     if (HasICData()) {
       EmitLoadIndexedPolymorphic(compiler, this);
     } else {
       compiler->EmitLoadIndexedGeneric(this);
     }
@@ skipping 108 matching lines @@
   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.
+                            deopt,  // deoptimize label.
+                            NULL,   // fallthrough when done.
                             comp->cid(),
                             comp->token_pos(),
                             comp->try_index());
-  __ Bind(&done);
 }
 
 
 void StoreIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
     if (HasICData()) {
       EmitStoreIndexedPolymorphic(compiler, this);
     } else {
       EmitStoreIndexedGeneric(compiler, this);
     }
@@ skipping 1116 matching lines @@
   __ movq(RAX,
       Address(RSP, (instance_call()->ArgumentCount() - 1) * kWordSize));
   __ testq(RAX, Immediate(kSmiTagMask));
   __ j(ZERO, is_smi_label);
   Label done;
   __ LoadClassId(RDI, RAX);
   compiler->EmitTestAndCall(*ic_data(),
                             RDI,  // Class id register.
                             instance_call()->ArgumentCount(),
                             instance_call()->argument_names(),
-                            deopt, &done,  // Labels.
+                            deopt,
+                            (is_smi_label == &handle_smi) ? &done : NULL,
                             instance_call()->cid(),
                             instance_call()->token_pos(),
                             instance_call()->try_index());
   if (is_smi_label == &handle_smi) {
     __ Bind(&handle_smi);
     ASSERT(ic_data()->GetReceiverClassIdAt(0) == kSmi);
     const Function& target = Function::ZoneHandle(ic_data()->GetTargetAt(0));
     compiler->GenerateStaticCall(instance_call()->cid(),
                                  instance_call()->token_pos(),
                                  instance_call()->try_index(),
                                  target,
                                  instance_call()->ArgumentCount(),
                                  instance_call()->argument_names());
   }
   __ Bind(&done);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64