Changes to improve the performance of reading a snapshot.

runtime/vm/snapshot.h

 // 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.
 
 #ifndef VM_SNAPSHOT_H_
 #define VM_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
@@ skipping 158 matching lines @@
   BaseReader(const uint8_t* buffer, intptr_t size) : stream_(buffer, size) {}
   // Reads raw data (for basic types).
   // sizeof(T) must be in {1,2,4,8}.
   template <typename T>
   T Read() {
     return ReadStream::Raw<sizeof(T), T>::Read(&stream_);
   }
 
   // Reads an intptr_t type value.
   intptr_t ReadIntptrValue() {
+  #if defined(ARCH_IS_32_BIT)

[Ivan Posva, 2014/06/09 20:48:20]

As discussed I don't think this is safe.

[zra, 2014/06/09 22:02:43]

Removed change here.

+    int32_t value = Read<int32_t>();
+  #elif defined(ARCH_IS_64_BIT)
     int64_t value = Read<int64_t>();
+  #endif
     ASSERT((value <= kIntptrMax) && (value >= kIntptrMin));
     return static_cast<intptr_t>(value);
   }
 
   void ReadBytes(uint8_t* addr, intptr_t len) {
     stream_.ReadBytes(addr, len);
   }
 
   double ReadDouble() {
     double result;
@@ skipping 449 matching lines @@
  private:
   SnapshotWriter* writer_;
   bool as_references_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_