| Index: src/objects.h | 
| diff --git a/src/objects.h b/src/objects.h | 
| index 801e98674a817a13d6e0e8592fd1a0e36699a85b..75ec7fe9e0b96ba9943260b30571b843c8a7e9dc 100644 | 
| --- a/src/objects.h | 
| +++ b/src/objects.h | 
| @@ -4642,8 +4642,7 @@ class ExternalArray: public FixedArrayBase { | 
| // ExternalArray headers are not quadword aligned. | 
| static const int kExternalPointerOffset = | 
| POINTER_SIZE_ALIGN(FixedArrayBase::kLengthOffset + kPointerSize); | 
| -  static const int kHeaderSize = kExternalPointerOffset + kPointerSize; | 
| -  static const int kAlignedSize = OBJECT_POINTER_ALIGN(kHeaderSize); | 
| +  static const int kSize = kExternalPointerOffset + kPointerSize; | 
|  | 
| private: | 
| DISALLOW_IMPLICIT_CONSTRUCTORS(ExternalArray); | 
| @@ -4885,7 +4884,7 @@ class FixedTypedArrayBase: public FixedArrayBase { | 
| public: | 
| DECLARE_CAST(FixedTypedArrayBase) | 
|  | 
| -  static const int kDataOffset = kHeaderSize; | 
| +  static const int kDataOffset = DOUBLE_POINTER_ALIGN(kHeaderSize); | 
|  | 
| inline int size(); | 
|  | 
| @@ -4914,14 +4913,6 @@ class FixedTypedArray: public FixedTypedArrayBase { | 
|  | 
| DECLARE_CAST(FixedTypedArray<Traits>) | 
|  | 
| -  static inline int ElementOffset(int index) { | 
| -    return kDataOffset + index * sizeof(ElementType); | 
| -  } | 
| - | 
| -  static inline int SizeFor(int length) { | 
| -    return ElementOffset(length); | 
| -  } | 
| - | 
| inline ElementType get_scalar(int index); | 
| static inline Handle<Object> get(Handle<FixedTypedArray> array, int index); | 
| inline void set(int index, ElementType value); | 
|  |