Last cleanup int -> intptr_t. Also removed a hack.

runtime/vm/snapshot.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/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 43 matching lines @@
 }
 
 
 static intptr_t ObjectIdFromClassId(intptr_t class_id) {
   ASSERT((class_id > kIllegalCid) && (class_id < kNumPredefinedCids));
   ASSERT(!RawObject::IsTypedDataViewClassId(class_id));
   return (class_id + kClassIdsOffset);
 }
 
 
-static RawType* GetType(ObjectStore* object_store, int index) {
+static RawType* GetType(ObjectStore* object_store, intptr_t index) {
   switch (index) {
     case kObjectType: return object_store->object_type();
     case kNullType: return object_store->null_type();
     case kFunctionType: return object_store->function_type();
     case kNumberType: return object_store->number_type();
     case kSmiType: return object_store->smi_type();
     case kMintType: return object_store->mint_type();
     case kDoubleType: return object_store->double_type();
     case kIntType: return object_store->int_type();
     case kBoolType: return object_store->bool_type();
     case kStringType: return object_store->string_type();
     case kArrayType: return object_store->array_type();
     default: break;
   }
   UNREACHABLE();
   return Type::null();
 }
 
 
-static int GetTypeIndex(ObjectStore* object_store, const RawType* raw_type) {
+static intptr_t GetTypeIndex(
+    ObjectStore* object_store, const RawType* raw_type) {
   ASSERT(raw_type->IsHeapObject());
   if (raw_type == object_store->object_type()) {
     return kObjectType;
   } else if (raw_type == object_store->null_type()) {
     return kNullType;
   } else if (raw_type == object_store->function_type()) {
     return kFunctionType;
   } else if (raw_type == object_store->number_type()) {
     return kNumberType;
   } else if (raw_type == object_store->smi_type()) {
@@ skipping 1390 matching lines @@
     UnmarkAll();
     isolate->set_long_jump_base(base);
   } else {
     isolate->set_long_jump_base(base);
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart