Make fewer assumptions about the layout of api handles.

runtime/vm/dart_api_state.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_DART_API_STATE_H_
 #define VM_DART_API_STATE_H_
 
 #include "include/dart_api.h"
 
 #include "platform/thread.h"
@@ skipping 87 matching lines @@
 
 // Implementation of persistent handles which are handed out through the
 // dart API.
 class PersistentHandle {
  public:
   // Accessors.
   RawObject* raw() const { return raw_; }
   void set_raw(RawObject* ref) { raw_ = ref; }
   void set_raw(const LocalHandle& ref) { raw_ = ref.raw(); }
   void set_raw(const Object& object) { raw_ = object.raw(); }
+  RawObject** raw_addr() { return &raw_; }
   static intptr_t raw_offset() { return OFFSET_OF(PersistentHandle, raw_); }
 
  private:
   friend class PersistentHandles;
 
   PersistentHandle() { }
   ~PersistentHandle() { }
 
   // Overload the raw_ field as a next pointer when adding freed
   // handles to the free list.
@@ skipping 16 matching lines @@
 
 // Implementation of persistent handles which are handed out through the
 // dart API.
 class FinalizablePersistentHandle {
  public:
   // Accessors.
   RawObject* raw() const { return raw_; }
   void set_raw(RawObject* raw) { raw_ = raw; }
   void set_raw(const LocalHandle& ref) { raw_ = ref.raw(); }
   void set_raw(const Object& object) { raw_ = object.raw(); }
+  RawObject** raw_addr() { return &raw_; }
   static intptr_t raw_offset() {
     return OFFSET_OF(FinalizablePersistentHandle, raw_);
   }
   void* peer() const { return peer_; }
   void set_peer(void* peer) { peer_ = peer; }
   Dart_WeakPersistentHandleFinalizer callback() const { return callback_; }
   void set_callback(Dart_WeakPersistentHandleFinalizer callback) {
     callback_ = callback;
   }
 
@@ skipping 230 matching lines @@
         values_(values), num_values_(values_length) {
   }
   ~WeakReferenceSet() {}
 
   WeakReferenceSet* next() const { return next_; }
 
   intptr_t num_keys() const { return num_keys_; }
   RawObject** get_key(intptr_t i) {
     ASSERT(i >= 0);
     ASSERT(i < num_keys_);
-    return reinterpret_cast<RawObject**>(keys_[i]);
+    return (reinterpret_cast<PersistentHandle*>(keys_[i]))->raw_addr();
   }
 
   intptr_t num_values() const { return num_values_; }
   RawObject** get_value(intptr_t i) {
     ASSERT(i >= 0);
     ASSERT(i < num_values_);
-    return reinterpret_cast<RawObject**>(values_[i]);
+    return (reinterpret_cast<PersistentHandle*>(values_[i]))->raw_addr();
   }
 
   static WeakReferenceSet* Pop(WeakReferenceSet** queue) {
     ASSERT(queue != NULL);
     WeakReferenceSet* head = *queue;
     if (head != NULL) {
       *queue = head->next();
       head->next_ = NULL;
     }
     return head;
@@ skipping 259 matching lines @@
           ApiNativeScope::Current()->zone()->GetBaseZone()) {}
   ApiGrowableArray()
       : BaseGrowableArray<T, ValueObject>(
           ApiNativeScope::Current()->zone()->GetBaseZone()) {}
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DART_API_STATE_H_