Revert r38116 because of crashes.

runtime/vm/intermediate_language_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 5468 matching lines @@
 
 
 void BranchInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   comparison()->EmitBranchCode(compiler, this);
 }
 
 
 LocationSummary* CheckClassInstr::MakeLocationSummary(Isolate* isolate,
                                                       bool opt) const {
   const intptr_t kNumInputs = 1;
-  const bool need_mask_temp = IsDenseSwitch() && !IsDenseMask(ComputeCidMask());
-  const intptr_t kNumTemps = !IsNullCheck() ? (need_mask_temp ? 2 : 1) : 0;
+  const intptr_t kNumTemps = !IsNullCheck() ? 1 : 0;
   LocationSummary* summary = new(isolate) LocationSummary(
       isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
   summary->set_in(0, Location::RequiresRegister());
   if (!IsNullCheck()) {
     summary->set_temp(0, Location::RequiresRegister());
-    if (need_mask_temp) {
-      summary->set_temp(1, Location::RequiresRegister());
-    }
   }
   return summary;
 }
 
 
 void CheckClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   const ICData::DeoptReasonId deopt_reason = licm_hoisted_ ?
       ICData::kDeoptHoistedCheckClass : ICData::kDeoptCheckClass;
   if (IsNullCheck()) {
     Label* deopt = compiler->AddDeoptStub(deopt_id(), deopt_reason);
@@ skipping 13 matching lines @@
   intptr_t cix = 0;
   if (unary_checks().GetReceiverClassIdAt(cix) == kSmiCid) {
     __ testl(value, Immediate(kSmiTagMask));
     __ j(ZERO, &is_ok);
     cix++;  // Skip first check.
   } else {
     __ testl(value, Immediate(kSmiTagMask));
     __ j(ZERO, deopt);
   }
   __ LoadClassId(temp, value);
-
-  if (IsDenseSwitch()) {
-    ASSERT(cids_[0] < cids_[cids_.length() - 1]);
-    __ subl(temp, Immediate(cids_[0]));
-    __ cmpl(temp, Immediate(cids_[cids_.length() - 1] - cids_[0]));
-    __ j(ABOVE, deopt);
-
-    intptr_t mask = ComputeCidMask();
-    if (!IsDenseMask(mask)) {
-      // Only need mask if there are missing numbers in the range.
-      ASSERT(cids_.length() > 2);
-      Register mask_reg = locs()->temp(1).reg();
-      __ movl(mask_reg, Immediate(mask));
-      __ bt(mask_reg, temp);
-      __ j(NOT_CARRY, deopt);
-    }
-  } else {
-    const intptr_t num_checks = cids_.length();
-    const bool use_near_jump = num_checks < 5;
-    for (intptr_t i = cix; i < num_checks; i++) {
-      ASSERT(cids_[i] != kSmiCid);
-      __ cmpl(temp, Immediate(cids_[i]));
-      if (i == (num_checks - 1)) {
-        __ j(NOT_EQUAL, deopt);
+  const intptr_t num_checks = unary_checks().NumberOfChecks();
+  const bool use_near_jump = num_checks < 5;
+  for (intptr_t i = cix; i < num_checks; i++) {
+    ASSERT(unary_checks().GetReceiverClassIdAt(i) != kSmiCid);
+    __ cmpl(temp, Immediate(unary_checks().GetReceiverClassIdAt(i)));
+    if (i == (num_checks - 1)) {
+      __ j(NOT_EQUAL, deopt);
+    } else {
+      if (use_near_jump) {
+        __ j(EQUAL, &is_ok, Assembler::kNearJump);
       } else {
-        if (use_near_jump) {
-          __ j(EQUAL, &is_ok, Assembler::kNearJump);
-        } else {
-          __ j(EQUAL, &is_ok);
-        }
+        __ j(EQUAL, &is_ok);
       }
     }
   }
   __ Bind(&is_ok);
 }
 
 
 LocationSummary* CheckSmiInstr::MakeLocationSummary(Isolate* isolate,
                                                     bool opt) const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 0;
   LocationSummary* summary = new(isolate) LocationSummary(
       isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
   summary->set_in(0, Location::RequiresRegister());
   return summary;
 }
 
 
 void CheckSmiInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register value = locs()->in(0).reg();
   Label* deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptCheckSmi);
   __ testl(value, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, deopt);
 }
 
 
-LocationSummary* CheckClassIdInstr::MakeLocationSummary(Isolate* isolate,
-                                                        bool opt) const {
-  const intptr_t kNumInputs = 2;
-  const intptr_t kNumTemps = 0;
-  LocationSummary* summary = new(isolate) LocationSummary(
-      isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
-  summary->set_in(0, Location::RequiresRegister());
-  summary->set_in(1, Location::RegisterOrSmiConstant(right()));
-  return summary;
-}
-
-
-void CheckClassIdInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  Register left = locs()->in(0).reg();
-  Location right = locs()->in(1);
-  Label* deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptCheckClass);
-  if (right.IsRegister()) {
-    __ cmpl(left, right.reg());
-  } else {
-    ASSERT(right.IsConstant());
-    const Object& right_const = Smi::Cast(right.constant());
-    __ cmpl(left, Immediate(reinterpret_cast<int32_t>(right_const.raw())));
-  }
-  __ j(NOT_ZERO, deopt);
-}
-
-
 // Length: register or constant.
 // Index: register, constant or stack slot.
 LocationSummary* CheckArrayBoundInstr::MakeLocationSummary(Isolate* isolate,
                                                            bool opt) const {
   const intptr_t kNumInputs = 2;
   const intptr_t kNumTemps = 0;
   LocationSummary* locs = new(isolate) LocationSummary(
       isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
   locs->set_in(kLengthPos, Location::RegisterOrSmiConstant(length()));
   ConstantInstr* index_constant = index()->definition()->AsConstant();
@@ skipping 787 matching lines @@
   __ movl(EDX, Immediate(kInvalidObjectPointer));
   __ movl(EDX, Immediate(kInvalidObjectPointer));
 #endif
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_IA32