Restore writing ObjectPool immediates as intptr_t.

runtime/vm/clustered_snapshot.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/clustered_snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 1595 matching lines @@
               // switching their stub. Reset to the initial stub used for
               // lazy-linking.
               s->WriteRef(StubCode::CallBootstrapCFunction_entry()->code());
               break;
             }
 #endif
           s->WriteRef(entry.raw_obj_);
           break;
         }
         case ObjectPool::kImmediate: {
-          s->Write<int32_t>(entry.raw_value_);
+          s->Write<intptr_t>(entry.raw_value_);
           break;
         }
         case ObjectPool::kNativeEntry: {
           // Write nothing. Will initialize with the lazy link entry.
 #if defined(TARGET_ARCH_DBC)
           UNREACHABLE();   // DBC does not support lazy native call linking.
 #endif
           break;
         }
         default:
@@ skipping 45 matching lines @@
       for (intptr_t j = 0; j < length; j++) {
         ObjectPool::EntryType entry_type =
             static_cast<ObjectPool::EntryType>(d->Read<int8_t>());
         info_array->ptr()->data()[j] = entry_type;
         RawObjectPool::Entry& entry = pool->ptr()->data()[j];
         switch (entry_type) {
           case ObjectPool::kTaggedObject:
             entry.raw_obj_ = d->ReadRef();
             break;
           case ObjectPool::kImmediate:
-            entry.raw_value_ = d->Read<int32_t>();
+            entry.raw_value_ = d->Read<intptr_t>();
             break;
           case ObjectPool::kNativeEntry: {
 #if !defined(TARGET_ARCH_DBC)
             // Read nothing. Initialize with the lazy link entry.
             uword new_entry = NativeEntry::LinkNativeCallEntry();
             entry.raw_value_ = static_cast<intptr_t>(new_entry);
 #else
             UNREACHABLE();  // DBC does not support lazy native call linking.
 #endif
             break;
@@ skipping 3340 matching lines @@
 
   deserializer.ReadVMSnapshot();
 
   Dart::set_instructions_snapshot_buffer(instructions_buffer_);
   Dart::set_data_snapshot_buffer(data_buffer_);
 
   return ApiError::null();
 }
 
 }  // namespace dart