Cleanup: Make CheckClassId instruction more general so it

runtime/vm/il_printer.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/il_printer.h"
 
 #include "vm/flow_graph_range_analysis.h"
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 194 matching lines @@
       (num_checks_to_print > targets.length())) {
     num_checks_to_print = targets.length();
   }
   for (intptr_t i = 0; i < num_checks_to_print; i++) {
     const CidRange& range = targets[i];
     const intptr_t count = targets.TargetAt(i)->count;
     target ^= targets.TargetAt(i)->target->raw();
     if (i > 0) {
       f->Print(" | ");
     }
-    if (range.cid_start == range.cid_end) {
+    if (range.IsSingleCid()) {
       const Class& cls =
           Class::Handle(Isolate::Current()->class_table()->At(range.cid_start));
       f->Print("%s", String::Handle(cls.Name()).ToCString());
       f->Print(" cid %" Pd " cnt:%" Pd " trgt:'%s'", range.cid_start, count,
                target.ToQualifiedCString());
     } else {
       const Class& cls = Class::Handle(target.Owner());
       f->Print("cid %" Pd "-%" Pd " %s", range.cid_start, range.cid_end,
                String::Handle(cls.Name()).ToCString());
       f->Print(" cnt:%" Pd " trgt:'%s'", count, target.ToQualifiedCString());
@@ skipping 16 matching lines @@
     num_checks_to_print = targets.length();
   }
   for (intptr_t i = 0; i < num_checks_to_print; i++) {
     const CidRange& range = targets[i];
     if (i > 0) {
       f->Print(" | ");
     }
     const Class& cls =
         Class::Handle(Isolate::Current()->class_table()->At(range.cid_start));
     f->Print("%s etc. ", String::Handle(cls.Name()).ToCString());
-    if (range.cid_start == range.cid_end) {
+    if (range.IsSingleCid()) {
       f->Print(" cid %" Pd, range.cid_start);
     } else {
       f->Print(" cid %" Pd "-%" Pd, range.cid_start, range.cid_end);
     }
   }
   if (num_checks_to_print < targets.length()) {
     f->Print("...");
   }
   f->Print("]");
 }
@@ skipping 785 matching lines @@
 void UnaryDoubleOpInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(op_kind()));
   value()->PrintTo(f);
 }
 
 
 void CheckClassIdInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
 
   const Class& cls =
-      Class::Handle(Isolate::Current()->class_table()->At(cid()));
-  f->Print(", %s", String::Handle(cls.ScrubbedName()).ToCString());
+      Class::Handle(Isolate::Current()->class_table()->At(cids().cid_start));
+  const String& name = String::Handle(cls.ScrubbedName());
+  if (cids().IsSingleCid()) {
+    f->Print(", %s", name.ToCString());
+  } else {
+    const Class& cls2 =
+        Class::Handle(Isolate::Current()->class_table()->At(cids().cid_end));
+    const String& name2 = String::Handle(cls2.ScrubbedName());
+    f->Print(", cid %" Pd "-%" Pd " %s-%s", cids().cid_start, cids().cid_end,
+             name.ToCString(), name2.ToCString());
+  }
 }
 
 
 void CheckClassInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
   PrintCidsHelper(f, cids_, FlowGraphPrinter::kPrintAll);
   if (IsNullCheck()) {
     f->Print(" nullcheck");
   }
 }
@@ skipping 315 matching lines @@
 }
 
 
 bool FlowGraphPrinter::ShouldPrint(const Function& function) {
   return false;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart