Finishes removing intptr_t from raw object fields.

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 834 matching lines @@
   RawArray* static_calls_target_table_;  // (code-offset, function, code).
   RawArray* stackmaps_;
   RawLocalVarDescriptors* var_descriptors_;
   RawArray* comments_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->comments_);
   }
 
   // Compilation timestamp.
   int64_t compile_timestamp_;
-  intptr_t pointer_offsets_length_;
+  int32_t pointer_offsets_length_;
   // Alive: If true, the embedded object pointers will be visited during GC.
   // This field cannot be shorter because of alignment issues on x64
   // architectures.
-  intptr_t state_bits_;  // state, is_optimized, is_alive.
+  int32_t state_bits_;  // state, is_optimized, is_alive.

[Ivan Posva, 2014/06/26 09:02:04]

Can we merge some of these fields into a bit field?

[zra, 2014/07/01 20:37:01]

Combined pointer_offsets_length_ and state_bits_ with a BitField.

 
   // PC offsets for code patching.
-  intptr_t entry_patch_pc_offset_;
-  intptr_t patch_code_pc_offset_;
-  intptr_t lazy_deopt_pc_offset_;
+  int32_t entry_patch_pc_offset_;
+  int32_t patch_code_pc_offset_;
+  int32_t lazy_deopt_pc_offset_;
 
   // Variable length data follows here.
   int32_t* data() { OPEN_ARRAY_START(int32_t, int32_t); }
 
   friend class StackFrame;
   friend class MarkingVisitor;
   friend class Function;
 };
 
 
 class RawInstructions : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Instructions);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->code_);
   }
   RawCode* code_;
   RawArray* object_pool_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->object_pool_);
   }
-  intptr_t size_;
+  int32_t size_;

[siva, 2014/08/25 17:33:20]

Instructions::kMaxElements should be changed to reflect this.

[zra, 2014/09/02 17:37:56]

Done.

 
   // Variable length data follows here.
   uint8_t* data() { OPEN_ARRAY_START(uint8_t, uint8_t); }
 
   // Private helper function used while visiting stack frames. The
   // code which iterates over dart frames is also called during GC and
   // is not allowed to create handles.
   static bool ContainsPC(RawObject* raw_obj, uword pc);
 
   friend class RawCode;
   friend class Code;
   friend class StackFrame;
   friend class MarkingVisitor;
   friend class Function;
 };
 
 
 class RawPcDescriptors : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(PcDescriptors);
 
-  intptr_t length_;  // Number of descriptors.
+  int32_t length_;  // Number of descriptors.

[siva, 2014/08/25 17:33:20]

PcDescriptors::kMaxElements should be changed to reflect this.

Ditto comment about other MaxElement fields defined in object.h

[zra, 2014/09/02 17:37:56]

Done.

 
   // Variable length data follows here.
   intptr_t* data() { OPEN_ARRAY_START(intptr_t, intptr_t); }
 
   friend class Object;
 };
 
 
 // Stackmap is an immutable representation of the layout of the stack at a
 // PC. The stack map representation consists of a bit map which marks each
 // live object index starting from the base of the frame.
 //
 // The Stackmap also consists of a link to the code object corresponding to
 // the frame which the stack map is describing.  The bit map representation
 // is optimized for dense and small bit maps, without any upper bound.
 class RawStackmap : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Stackmap);
 
   // TODO(kmillikin): We need a small number of bits to encode the register
   // count.  Consider packing them in with the length.
-  intptr_t length_;  // Length of payload, in bits.
-  intptr_t register_bit_count_;  // Live register bits, included in length_.
+  int32_t length_;  // Length of payload, in bits.
+  int32_t register_bit_count_;  // Live register bits, included in length_.

[Ivan Posva, 2014/06/26 09:02:04]

BitField?

[zra, 2014/07/01 20:37:01]

On arm64 register_bit_count_ could be as high as 96, meaning 7 bits for the
register count, and 25 bits for the length of the rest of the map (max ~33
million). If that limit is okay, I'll go ahead with the change.

[siva, 2014/08/25 17:33:20]

should the signatures of
RegisterBitCount
SetRegisterBitCount
be changed to refplect this or we could just add an assertion
in SetRegisterBitCount to ensure the value is < kInt32Max.

[zra, 2014/09/02 17:37:56]

Added ASSERT to SetRegisterBitCount. Thoughts on changing to BitField? Is 33
million enough? Added a comment in case we don't resolve.

 
   uword pc_;  // PC corresponding to this stack map representation.

[Ivan Posva, 2014/06/26 09:02:04]

We should encode most of these PCs as offset from the entry point of the
corresponding code.

[zra, 2014/07/01 20:37:01]

This one done.

 
   // Variable length data follows here (bitmap of the stack layout).
   uint8_t* data() { OPEN_ARRAY_START(uint8_t, uint8_t); }
 };
 
 
 class RawLocalVarDescriptors : public RawObject {
  public:
   enum VarInfoKind {
     kStackVar = 1,
     kContextVar,
     kContextLevel,
     kSavedEntryContext,
     kSavedCurrentContext
   };
 
   struct VarInfo {
-    intptr_t index;      // Slot index on stack or in context.
+    int32_t index;      // Slot index on stack or in context.
     int8_t   kind;       // Entry kind of type VarInfoKind.

[Ivan Posva, 2014/06/26 09:02:04]

The index and kind field could be merged into a bitfield: 24 bit index, 8 bit
kind for example.

Also, we will need to document the implementation limits we are introducing by
this. If we go with the above suggestion that means that a code object is
limited to 16.7 million stack slots.

There are potentially more options to reduce this data.

[zra, 2014/07/01 20:37:01]

Done.

     int16_t  scope_id;   // Scope to which the variable belongs.
-    intptr_t begin_pos;  // Token position of scope start.
-    intptr_t end_pos;    // Token position of scope end.
+    int32_t begin_pos;  // Token position of scope start.
+    int32_t end_pos;    // Token position of scope end.
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(LocalVarDescriptors);
-  intptr_t length_;  // Number of descriptors.
+  int32_t length_;  // Number of descriptors.
   RawArray* names_;  // Array of [length_] variable names.

[Ivan Posva, 2014/06/26 09:02:04]

These two fields should be swapped to get better alignment on 64-bit
architectures.

[zra, 2014/07/01 20:37:01]

Done.

 
   // Variable info with [length_] entries.
   VarInfo* data() { OPEN_ARRAY_START(VarInfo, intptr_t); }

[Ivan Posva, 2014/06/26 09:02:04]

The alignment here should probably be int32_t, as we really only need to be
aligned to 32-bits for the VarInfo structure.

[zra, 2014/07/01 20:37:01]

Done.

 };
 
 
 class RawExceptionHandlers : public RawObject {
  public:
   // The index into the ExceptionHandlers table corresponds to
   // the try_index of the handler.
   struct HandlerInfo {
     intptr_t handler_pc;       // PC value of handler.
     int16_t outer_try_index;   // Try block index of enclosing try block.
     int8_t needs_stacktrace;   // True if a stacktrace is needed.
     int8_t has_catch_all;      // Catches all exceptions.
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
 
   // Number of exception handler entries.
-  intptr_t length_;
+  int32_t length_;
 
   // Array with [length_] entries. Each entry is an array of all handled
   // exception types.
   RawArray* handled_types_data_;
 
   // Exception handler info of length [length_].
   HandlerInfo* data() { OPEN_ARRAY_START(HandlerInfo, intptr_t); }
 };
 
 
 // Contains an array of deoptimization commands, e.g., move a specific register
 // into a specific slot of unoptimized frame.
 class RawDeoptInfo : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(DeoptInfo);
 
   RawSmi* length_;  // Number of deoptimization commands
 
   // Variable length data follows here.
   intptr_t* data() { OPEN_ARRAY_START(intptr_t, intptr_t); }
 };
 
 
 class RawContext : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Context);
 
-  intptr_t num_variables_;
+  int32_t num_variables_;
   Isolate* isolate_;
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->parent_); }
   RawContext* parent_;
 
   // Variable length data follows here.
   RawInstance** data() { OPEN_ARRAY_START(RawInstance*, RawInstance*); }
   RawObject** to(intptr_t num_vars) {
     return reinterpret_cast<RawObject**>(&ptr()->data()[num_vars - 1]);
   }
 
   friend class SnapshotReader;
 };
 
 
 class RawContextScope : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ContextScope);
 
-  // TODO(iposva): Switch to convential enum offset based structure to avoid
+  // TODO(iposva): Switch to conventional enum offset based structure to avoid
   // alignment mishaps.
   struct VariableDesc {
     RawSmi* token_pos;
     RawString* name;
     RawBool* is_final;
     RawBool* is_const;
     union {
       RawAbstractType* type;
       RawInstance* value;  // iff is_const is true
     };
     RawSmi* context_index;
     RawSmi* context_level;
   };
 
-  intptr_t num_variables_;
+  int32_t num_variables_;
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->data()[0]);
   }
   // Variable length data follows here.
   RawObject** data() { OPEN_ARRAY_START(RawObject*, RawObject*); }
   RawObject** to(intptr_t num_vars) {
     const intptr_t data_length = num_vars * (sizeof(VariableDesc)/kWordSize);
     return reinterpret_cast<RawObject**>(&ptr()->data()[data_length - 1]);
   }
@@ skipping 248 matching lines @@
   friend class SnapshotReader;
 };
 
 
 class RawBigint : public RawInteger {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Bigint);
 
   // Actual length in chunks at the time of allocation (later we may
   // clamp the operational length but we need to maintain a consistent
   // object length so that the object can be traversed during GC).
-  intptr_t allocated_length_;
+  int32_t allocated_length_;
 
   // Operational length in chunks of the bigint object, clamping can
   // cause this length to be reduced. If the signed_length_ is
   // negative then the number is negative.
-  intptr_t signed_length_;
+  int32_t signed_length_;
 
   // A sequence of Chunks (typedef in Bignum) representing bignum digits.
   // Bignum::Chunk chunks_[Utils::Abs(signed_length_)];
   uint8_t* data() { OPEN_ARRAY_START(uint8_t, uint8_t); }
 
   friend class SnapshotReader;
 };
 
 
 class RawDouble : public RawNumber {
@@ skipping 273 matching lines @@
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->data_length_);
   }
   RawSmi* data_length_;
   RawSmi* num_bracket_expressions_;
   RawString* pattern_;  // Pattern to be used for matching.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->pattern_);
   }
 
-  intptr_t type_;  // Uninitialized, simple or complex.
-  intptr_t flags_;  // Represents global/local, case insensitive, multiline.
+  int32_t type_;  // Uninitialized, simple or complex.
+  int32_t flags_;  // Represents global/local, case insensitive, multiline.

[Ivan Posva, 2014/06/26 09:02:04]

How many values can each of these fields contain?

[zra, 2014/07/01 20:37:01]

type_ can be 3, and flags can be 4. I've changed this to an int8_t bitfield.

 
   // Variable length data follows here.
   uint8_t* data() { OPEN_ARRAY_START(uint8_t, uint8_t); }
 };
 
 
 class RawWeakProperty : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(WeakProperty);
 
   RawObject** from() {
@@ skipping 252 matching lines @@
   COMPILE_ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 14);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_