Simplify EmitTestAndCall and eliminated excessive code generation (two Smi tests emitted).

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 711 matching lines @@
     __ testq(left, Immediate(kSmiTagMask));
     __ j(ZERO, &done);
     __ LoadClassId(RDI, left);
     __ Bind(&done);
     const intptr_t kNumArguments = 2;
     compiler->EmitTestAndCall(ICData::Handle(ic_data()->AsUnaryClassChecks()),
                               RDI,  // Class id register.
                               kNumArguments,
                               Array::Handle(),  // No named arguments.
                               deopt,  // Deoptimize target.
-                              NULL,   // Fallthrough when done.
                               deopt_id(),
                               token_pos(),
                               try_index(),
                               locs());
     ASSERT(locs()->out().reg() == RAX);
     return;
   }
   const String& function_name =
       String::ZoneHandle(Symbols::New(Token::Str(kind())));
   compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
@@ skipping 1394 matching lines @@
     const Function& target = Function::ZoneHandle(ic_data()->GetTargetAt(0));
     compiler->GenerateStaticCall(instance_call()->deopt_id(),
                                  instance_call()->token_pos(),
                                  instance_call()->try_index(),
                                  target,
                                  instance_call()->ArgumentCount(),
                                  instance_call()->argument_names(),
                                  locs());
     return;
   }
-  Label handle_smi;
-  Label* is_smi_label =
-      ic_data()->GetReceiverClassIdAt(0) == kSmiCid ?  &handle_smi : deopt;
 
   // Load receiver into RAX.
   __ movq(RAX,
       Address(RSP, (instance_call()->ArgumentCount() - 1) * kWordSize));
+  Label done;
+  __ movq(RDI, Immediate(kSmiCid));
   __ testq(RAX, Immediate(kSmiTagMask));
-  __ j(ZERO, is_smi_label);
-  Label done;
+  __ j(ZERO, &done);
   __ LoadClassId(RDI, RAX);
+  __ Bind(&done);
   compiler->EmitTestAndCall(*ic_data(),
                             RDI,  // Class id register.
                             instance_call()->ArgumentCount(),
                             instance_call()->argument_names(),
                             deopt,
-                            (is_smi_label == &handle_smi) ? &done : NULL,
                             instance_call()->deopt_id(),
                             instance_call()->token_pos(),
                             instance_call()->try_index(),
                             locs());
-  if (is_smi_label == &handle_smi) {
-    __ Bind(&handle_smi);
-    ASSERT(ic_data()->GetReceiverClassIdAt(0) == kSmiCid);
-    const Function& target = Function::ZoneHandle(ic_data()->GetTargetAt(0));
-    compiler->GenerateStaticCall(instance_call()->deopt_id(),
-                                 instance_call()->token_pos(),
-                                 instance_call()->try_index(),
-                                 target,
-                                 instance_call()->ArgumentCount(),
-                                 instance_call()->argument_names(),
-                                 locs());
-  }
-  __ Bind(&done);
 }
 
 
 // TODO(srdjan): Move to shared.
 static bool ICDataWithBothClassIds(const ICData& ic_data, intptr_t class_id) {
   if (ic_data.num_args_tested() != 2) return false;
   if (ic_data.NumberOfChecks() != 1) return false;
   Function& target = Function::Handle();
   GrowableArray<intptr_t> class_ids;
   ic_data.GetCheckAt(0, &class_ids, &target);
@@ skipping 185 matching lines @@
   __ testq(value, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, deopt);
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64