Fix PersistentHeapHashMap to work with stack allocated, heap backed weak collections

Source/heap/HeapTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 138 matching lines @@
         ASSERT(header->payload());
         m_count++;
     }
 
     virtual void mark(FinalizedHeapObjectHeader* header, TraceCallback callback) OVERRIDE
     {
         ASSERT(header->payload());
         m_count++;
     }
 
-    virtual void registerWeakMembers(const void*, WeakPointerCallback) OVERRIDE { }
+    virtual void registerWeakMembers(const void*, const void*, WeakPointerCallback) OVERRIDE { }
     virtual void registerWeakCell(void**, WeakPointerCallback) OVERRIDE { }
     virtual bool isMarked(const void*) OVERRIDE { return false; }
 
     FOR_EACH_TYPED_HEAP(DEFINE_VISITOR_METHODS)
 
     size_t count() { return m_count; }
     void reset() { m_count = 0; }
 
 private:
     size_t m_count;
@@ skipping 223 matching lines @@
 private:
     virtual void runThread() OVERRIDE
     {
         ThreadState::attach();
 
         int gcCount = 0;
         while (!done()) {
             ThreadState::current()->safePoint(ThreadState::NoHeapPointersOnStack);
             {
                 Persistent<HeapHashMap<ThreadMarker, WeakMember<IntWrapper> > > weakMap = new HeapHashMap<ThreadMarker, WeakMember<IntWrapper> >;
+                PersistentHeapHashMap<ThreadMarker, WeakMember<IntWrapper> > weakMap2;
 
                 for (int i = 0; i < numberOfAllocations; i++) {
                     weakMap->add(static_cast<unsigned>(i), IntWrapper::create(0));
+                    weakMap2.add(static_cast<unsigned>(i), IntWrapper::create(0));
                     if (!(i % 10)) {
                         ThreadState::current()->safePoint(ThreadState::NoHeapPointersOnStack);
                     }
                     yield();
                 }
 
                 if (gcCount < gcPerThread) {
                     Heap::collectGarbage(ThreadState::NoHeapPointersOnStack);
                     gcCount++;
                     atomicIncrement(&m_gcCount);
                 }
 
                 Heap::collectGarbage(ThreadState::NoHeapPointersOnStack);
                 EXPECT_TRUE(weakMap->isEmpty());
+                EXPECT_TRUE(weakMap2.isEmpty());
             }
             yield();
         }
         ThreadState::detach();
         atomicDecrement(&m_threadsToFinish);
     }
 };
 
 // The accounting for memory includes the memory used by rounding up object
 // sizes. This is done in a different way on 32 bit and 64 bit, so we have to
@@ skipping 2384 matching lines @@
 
 namespace WTF {
 
 // We need the below vector trait specialization for the above HeapVectors to behave correctly wrt. memset, memcmp etc.
 template<> struct VectorTraits<WebCore::VectorObject> : public SimpleClassVectorTraits<WebCore::VectorObject> { };
 template<> struct VectorTraits<WebCore::VectorObjectInheritedTrace> : public SimpleClassVectorTraits<WebCore::VectorObjectInheritedTrace> { };
 template<> struct VectorTraits<WebCore::VectorObjectNoTrace> : public SimpleClassVectorTraits<WebCore::VectorObjectNoTrace> { };
 
 } // WTF namespace