- Do not mix scalar values and object fields in RawInstance to

runtime/vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 1217 matching lines @@
   RawSmi* length_;
   RawArray* data_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->data_);
   }
 
   friend class SnapshotReader;
 };
 
 
+// Define an aliases for intptr_t.
+#if defined(ARCH_IS_32_BIT)
+#define RawIntPtrArray RawInt32Array
+#define IntPtrArray Int32Array
+#elif defined(ARCH_IS_64_BIT)
+#define RawIntPtrArray RawInt64Array
+#define IntPtrArray Int64Array
+#else
+#error Architecture is not 32-bit or 64-bit.
+#endif  // ARCH_IS_32_BIT
+
+
 class RawByteArray : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ByteArray);
 
  protected:
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
   RawSmi* length_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
 };
 
 
@@ skipping 27 matching lines @@
   // Variable length data follows here.
   uint16_t data_[0];
 };
 
 
 class RawInt32Array : public RawByteArray {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Int32Array);
 
   // Variable length data follows here.
   int32_t data_[0];
+
+  friend class Instance;
 };
 
 
 class RawUint32Array : public RawByteArray {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Uint32Array);
 
   // Variable length data follows here.
   uint32_t data_[0];
 };
 
@@ skipping 319 matching lines @@
          kExternalUint64ArrayCid == kExternalInt8ArrayCid + 7 &&
          kExternalFloat32ArrayCid == kExternalInt8ArrayCid + 8 &&
          kExternalFloat64ArrayCid == kExternalInt8ArrayCid + 9 &&
          kStacktraceCid == kExternalInt8ArrayCid + 10);
   return (index >= kExternalInt8ArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_