Revert revision 40228

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/atomic.h"
 #include "vm/globals.h"
@@ skipping 1079 matching lines @@
     int32_t index() const {
       return IndexBits::decode(index_kind) - kIndexBias;
     }
     void set_index(int32_t index) {
       index_kind = IndexBits::update(index + kIndexBias, index_kind);
     }
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(LocalVarDescriptors);
-  int32_t num_entries_;  // Number of descriptors.
+  RawArray* names_;  // Array of [length_] variable names.
+  int32_t length_;  // Number of descriptors.
 
-  RawObject** from() {
-    return reinterpret_cast<RawObject**>(&ptr()->names()[0]);
-  }
-  RawString** names() {
-    // Array of [num_entries_] variable names.
-    OPEN_ARRAY_START(RawString*, RawString*);
-  }
-  RawString** nameAddrAt(intptr_t i) {
-    return &(ptr()->names()[i]);
-  }
-
-  RawObject** to(intptr_t num_entries) {
-    return reinterpret_cast<RawObject**>(nameAddrAt(num_entries - 1));
-  }
-
-  // Variable info with [num_entries_] entries.
-  VarInfo* data() {
-    return reinterpret_cast<VarInfo*>(nameAddrAt(ptr()->num_entries_));
-  }
+  // Variable info with [length_] entries.
+  VarInfo* data() { OPEN_ARRAY_START(VarInfo, int32_t); }
 
   friend class Object;
 };
 
 
 class RawExceptionHandlers : public RawObject {
  public:
   // The index into the ExceptionHandlers table corresponds to
   // the try_index of the handler.
   struct HandlerInfo {
@@ skipping 921 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_