Add explicit smi checks for unary smi operations.

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 1954 matching lines @@
   const intptr_t kNumTemps = 0;
   LocationSummary* summary =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
   summary->set_in(0, Location::RequiresRegister());
   summary->set_out(Location::SameAsFirstInput());
   return summary;
 }
 
 
 void UnarySmiOpComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  const ICData& ic_data = *instance_call()->ic_data();
-  ASSERT(!ic_data.IsNull());
-  ASSERT(ic_data.num_args_tested() == 1);
-  // TODO(srdjan): Implement for more checks.
-  ASSERT(ic_data.NumberOfChecks() == 1);
-  intptr_t test_class_id;
-  Function& target = Function::Handle();
-  ic_data.GetOneClassCheckAt(0, &test_class_id, &target);
-
   Register value = locs()->in(0).reg();
-  Register result = locs()->out().reg();
-  ASSERT(value == result);
-  Label* deopt = compiler->AddDeoptStub(instance_call()->deopt_id(),
-                                        instance_call()->try_index(),
-                                        kDeoptUnaryOp);
-  if (test_class_id == kSmiCid) {
-    __ testq(value, Immediate(kSmiTagMask));
-    __ j(NOT_ZERO, deopt);
-    switch (op_kind()) {
-      case Token::kNEGATE:
-        __ negq(value);
-        __ j(OVERFLOW, deopt);
-        break;
-      case Token::kBIT_NOT:
-        __ notq(value);
-        __ andq(value, Immediate(~kSmiTagMask));  // Remove inverted smi-tag.
-        break;
-      default:
-        UNREACHABLE();
+  ASSERT(value == locs()->out().reg());
+  switch (op_kind()) {
+    case Token::kNEGATE: {
+      Label* deopt = compiler->AddDeoptStub(instance_call()->deopt_id(),
+                                            instance_call()->try_index(),
+                                            kDeoptUnaryOp);
+      __ negq(value);
+      __ j(OVERFLOW, deopt);
+      break;
     }
-  } else {
-    UNREACHABLE();
+    case Token::kBIT_NOT:
+      __ notq(value);
+      __ andq(value, Immediate(~kSmiTagMask));  // Remove inverted smi-tag.
+      break;
+    default:
+      UNREACHABLE();
   }
 }
 
 
 LocationSummary* NumberNegateComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 1;  // Needed for doubles.
   LocationSummary* summary =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
   summary->set_in(0, Location::RegisterLocation(RAX));
@@ skipping 374 matching lines @@
   __ testq(value, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, deopt);
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64