Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

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/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 
@@ skipping 370 matching lines @@
 }
 
 
 void UnarySmiOpComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(op_kind()));
   value()->PrintTo(f);
 }
 
 
 void ToDoubleComp::PrintOperandsTo(BufferFormatter* f) const {
-  ASSERT(from() == kDouble || from() == kSmi);
-  f->Print("%s ", from() == kDouble ? "double2double" : "smi2double");
+  ASSERT(from() == kDoubleCid || from() == kSmiCid);
+  f->Print("%s ", from() == kDoubleCid ? "double2double" : "smi2double");
   value()->PrintTo(f);
 }
 
 
 void GraphEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [graph]", block_id());
   if (start_env_ != NULL) {
     start_env_->PrintTo(f);
   }
 }
@@ skipping 377 matching lines @@
         !locations_[i].IsInvalid()) {
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart