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

vm/heap.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/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/compiler_stats.h"
 #include "vm/flags.h"
@@ skipping 151 matching lines @@
 
 void Heap::IterateCodeObjects(ObjectVisitor* visitor) {
   code_space_->VisitObjects(visitor);
 }
 
 
 RawInstructions* Heap::FindObjectInCodeSpace(FindObjectVisitor* visitor) {
   // The code heap can only have RawInstructions objects.
   RawObject* raw_obj = code_space_->FindObject(visitor);
   ASSERT((raw_obj == Object::null()) ||
-         (raw_obj->GetClassId() == kInstructions));
+         (raw_obj->GetClassId() == kInstructionsCid));
   return reinterpret_cast<RawInstructions*>(raw_obj);
 }
 
 
 void Heap::CollectGarbage(Space space, ApiCallbacks api_callbacks) {
   bool invoke_api_callbacks = (api_callbacks == kInvokeApiCallbacks);
   switch (space) {
     case kNew:
       new_space_->Scavenge(invoke_api_callbacks);
       if (new_space_->HadPromotionFailure()) {
@@ skipping 155 matching lines @@
   isolate()->IncrementNoGCScopeDepth();
 }
 
 
 NoGCScope::~NoGCScope() {
   isolate()->DecrementNoGCScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 }  // namespace dart