DBC: Remove special case from CheckClassInstr. Cleanup.

runtime/vm/intermediate_language_dbc.cc

 // Copyright (c) 2016, 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_DBC.
 #if defined(TARGET_ARCH_DBC)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/cpu.h"
@@ skipping 210 matching lines @@
 }
 
 
 LocationSummary* PolymorphicInstanceCallInstr::MakeLocationSummary(
     Zone* zone, bool optimizing) const {
   return MakeCallSummary(zone);
 }
 
 
 void PolymorphicInstanceCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-#if defined(PRODUCT)
-  compiler->Bailout("PolymorphicInstanceCallInstr::EmitNativeCode");
-#else  // defined(PRODUCT)
-  compiler->Bailout(ToCString());
-#endif  // defined(PRODUCT)
+  Unsupported(compiler);
+  UNREACHABLE();
 }
 
 
 EMIT_NATIVE_CODE(Stop, 0) {
   __ Stop(message());
 }
 
 
 EMIT_NATIVE_CODE(CheckStackOverflow,
                  0, Location::NoLocation(),
@@ skipping 312 matching lines @@
   compiler->RecordSafepoint(locs());
   if (compiler->is_optimizing()) {
     __ PopLocal(locs()->out(0).reg());
   }
 }
 
 
 EMIT_NATIVE_CODE(StoreIndexed, 3) {
   if (compiler->is_optimizing()) {
     if (class_id() != kArrayCid) {
-#if defined(PRODUCT)
-      compiler->Bailout("StoreIndexed");
-#else  // defined(PRODUCT)
-      compiler->Bailout(ToCString());
-#endif  // defined(PRODUCT)
+      Unsupported(compiler);
+      UNREACHABLE();
     }
-
     __ StoreIndexed(locs()->in(kArrayPos).reg(),
                     locs()->in(kIndexPos).reg(),
                     locs()->in(kValuePos).reg());
   } else {
     ASSERT(class_id() == kArrayCid);
     __ StoreIndexedTOS();
   }
 }
 
 
@@ skipping 423 matching lines @@
     compiler->EmitDeopt(deopt_id(), ICData::kDeoptBinaryDoubleOp,
                         licm_hoisted_ ? ICData::kHoisted : 0);
     __ CheckSmi(right);
   }
   compiler->EmitDeopt(deopt_id(), ICData::kDeoptBinaryDoubleOp,
                       licm_hoisted_ ? ICData::kHoisted : 0);
 }
 
 
 EMIT_NATIVE_CODE(CheckClassId, 1) {
-  if (!Utils::IsUint(16, cid_)) {
-#if defined(PRODUCT)
-    compiler->Bailout("CheckClassInstr::EmitNativeCode");
-#else  // defined(PRODUCT)
-    compiler->Bailout(ToCString());
-#endif  // defined(PRODUCT)
-  }
-  __ CheckClassId(locs()->in(0).reg(), cid_);
+  __ CheckClassId(locs()->in(0).reg(),
+                  compiler->ToEmbeddableCid(cid_, this));
   compiler->EmitDeopt(deopt_id(), ICData::kDeoptCheckClass);
 }
 
 
 EMIT_NATIVE_CODE(CheckClass, 1) {
-#if defined(PRODUCT)
-  const char* bailout_msg = "CheckClassInstr::EmitNativeCode";
-#else  // defined(PRODUCT)
-  const char* bailout_msg = ToCString();
-#endif  // defined(PRODUCT)
   const Register value = locs()->in(0).reg();
   if (IsNullCheck()) {
     ASSERT(DeoptIfNull() || DeoptIfNotNull());
     if (DeoptIfNull()) {
       __ IfEqNull(value);
     } else {
       __ IfNeNull(value);
     }
   } else {
     ASSERT((unary_checks().GetReceiverClassIdAt(0) != kSmiCid) ||
            (unary_checks().NumberOfChecks() > 1));
     const intptr_t may_be_smi =
         (unary_checks().GetReceiverClassIdAt(0) == kSmiCid) ? 1 : 0;
     if (IsDenseSwitch()) {
       ASSERT(cids_[0] < cids_[cids_.length() - 1]);
       const intptr_t low_cid = cids_[0];
-      if (!Utils::IsUint(16, low_cid)) {
-        compiler->Bailout(bailout_msg);
-      }
       const intptr_t cid_mask = ComputeCidMask();
       __ CheckDenseSwitch(value, may_be_smi);
-      __ Nop(low_cid);
+      __ Nop(compiler->ToEmbeddableCid(low_cid, this));
       __ Nop(__ AddConstant(Smi::Handle(Smi::New(cid_mask))));
     } else {
       GrowableArray<CidTarget> sorted_ic_data;
       FlowGraphCompiler::SortICDataByCount(unary_checks(),
                                            &sorted_ic_data,
                                            /* drop_smi = */ true);
       const intptr_t sorted_length = sorted_ic_data.length();
-      ASSERT(sorted_length >= 1);
-      if (sorted_length == 1) {
-        const intptr_t cid = sorted_ic_data[0].cid;
-        if (!Utils::IsUint(16, cid)) {
-          compiler->Bailout(bailout_msg);
-        }
-        __ CheckClassId(value, cid);
-      } else {
-        if (!Utils::IsUint(8, sorted_length)) {
-          compiler->Bailout(bailout_msg);
-        }
-        __ CheckCids(value, may_be_smi, sorted_length);
-        for (intptr_t i = 0; i < sorted_length; i++) {
-          const intptr_t cid = sorted_ic_data[i].cid;
-          if (!Utils::IsUint(16, cid)) {
-            compiler->Bailout(bailout_msg);
-          }
-          __ Nop(cid);
-        }
+      if (!Utils::IsUint(8, sorted_length)) {
+        Unsupported(compiler);
+        UNREACHABLE();
+      }
+      __ CheckCids(value, may_be_smi, sorted_length);
+      for (intptr_t i = 0; i < sorted_length; i++) {
+        __ Nop(compiler->ToEmbeddableCid(sorted_ic_data[i].cid, this));
       }
     }
   }
   compiler->EmitDeopt(deopt_id(),
                       ICData::kDeoptCheckClass,
                       licm_hoisted_ ? ICData::kHoisted : 0);
 }
 
 
 EMIT_NATIVE_CODE(BinarySmiOp, 2, Location::RequiresRegister()) {
@@ skipping 65 matching lines @@
       __ BitNot(locs()->out(0).reg(), locs()->in(0).reg());
       break;
     default:
       UNREACHABLE();
   }
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_DBC