- Revert r24564 and r24563 due to unexplained malloc corruption.

runtime/vm/pages.h

 // Copyright (c) 2011, 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_PAGES_H_
 #define VM_PAGES_H_
 
+#include <map>
+
 #include "vm/freelist.h"
 #include "vm/globals.h"
 #include "vm/virtual_memory.h"
 
 namespace dart {
 
 // Forward declarations.
 class Heap;
 class ObjectPointerVisitor;
 
@@ skipping 178 matching lines @@
   void SetGrowthControlState(bool state) {
     page_space_controller_.set_is_enabled(state);
   }
 
   bool GrowthControlState() {
     return page_space_controller_.is_enabled();
   }
 
   void WriteProtect(bool read_only);
 
+  typedef std::map<RawObject*, void*> PeerTable;
+
+  void SetPeer(RawObject* raw_obj, void* peer);
+
+  void* GetPeer(RawObject* raw_obj);
+
+  int64_t PeerCount() const;
+
+  PeerTable* GetPeerTable() { return &peer_table_; }
+
  private:
   // Ids for time and data records in Heap::GCStats.
   enum {
     // Time
     kMarkObjects = 0,
     kResetFreeLists = 1,
     kSweepPages = 2,
     kSweepLargePages = 3,
     // Data
     kGarbageRatio = 0,
@@ skipping 18 matching lines @@
   }
 
   FreeList freelist_[HeapPage::kNumPageTypes];
 
   Heap* heap_;
 
   HeapPage* pages_;
   HeapPage* pages_tail_;
   HeapPage* large_pages_;
 
+  PeerTable peer_table_;
+
   // Various sizes being tracked for this generation.
   intptr_t max_capacity_;
   intptr_t capacity_;
   intptr_t in_use_;
 
   // Keep track whether a MarkSweep is currently running.
   bool sweeping_;
 
   PageSpaceController page_space_controller_;
 
   friend class PageSpaceController;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageSpace);
 };
 
 }  // namespace dart
 
 #endif  // VM_PAGES_H_