Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 137 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/collector/handles/HandleHeap.cpp b/Source/JavaScriptCore/collector/handles/HandleHeap.cpp
new file mode 100644
index 0000000..32fa42d
--- /dev/null
+++ b/Source/JavaScriptCore/collector/handles/HandleHeap.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2011 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "HandleHeap.h"
+
+#include "JSObject.h"
+
+namespace JSC {
+
+HandleHeap::HandleHeap(JSGlobalData* globalData)
+    : m_globalData(globalData)
+    , m_nextToFinalize(0)
+#if !ASSERT_DISABLED
+    , m_handlingFinalizers(false)
+#endif
+{
+    grow();
+}
+
+void HandleHeap::grow()
+{
+    Node* block = m_blockStack.grow();
+    for (int i = m_blockStack.blockLength - 1; i >= 0; --i) {
+        Node* node = &block[i];
+        new (node) Node(this);
+        m_freeList.push(node);
+    }
+}
+
+void HandleHeap::markStrongHandles(MarkStack& markStack)
+{
+    Node* end = m_strongList.end();
+    for (Node* node = m_strongList.begin(); node != end; node = node->next())
+        markStack.deprecatedAppend(node->slot());
+}
+
+void HandleHeap::updateAfterMark()
+{
+    clearWeakPointers();
+}
+
+void HandleHeap::clearWeakPointers()
+{
+#if !ASSERT_DISABLED
+    m_handlingFinalizers = true;
+#endif
+    Node* end = m_weakList.end();
+    for (Node* node = m_weakList.begin(); node != end;) {
+        Node* current = node;
+        node = current->next();
+        
+        JSValue value = *current->slot();
+        if (!value || !value.isCell())
+            continue;
+        
+        JSCell* cell = value.asCell();
+        ASSERT(!cell || cell->structure());
+
+        if (Heap::isMarked(cell))
+            continue;
+        
+        if (Finalizer* finalizer = current->finalizer()) {
+            m_nextToFinalize = node;
+            finalizer->finalize(Handle<Unknown>::wrapSlot(current->slot()), current->finalizerContext());
+            node = m_nextToFinalize;
+            m_nextToFinalize = 0;
+        } 
+        
+        if (current->isSelfDestroying()) {
+            ASSERT(node != current);
+            ASSERT(current->next() == node);
+            deallocate(toHandle(current));
+        } else if (current->next() == node) { // if current->next() != node, then current has been deallocated
+            SentinelLinkedList<Node>::remove(current);
+            *current->slot() = JSValue();
+            m_immediateList.push(current);
+        }
+    }
+#if !ASSERT_DISABLED
+    m_handlingFinalizers = false;
+#endif
+}
+
+void HandleHeap::writeBarrier(HandleSlot slot, const JSValue& value)
+{
+    ASSERT(!m_handlingFinalizers);
+    if (slot->isCell() == value.isCell() && !value == !*slot)
+        return;
+    Node* node = toNode(slot);
+    SentinelLinkedList<Node>::remove(node);
+    if (!value.isCell() || !value) {
+        m_immediateList.push(node);
+        return;
+    }
+    if (node->isWeak())
+        m_weakList.push(node);
+    else
+        m_strongList.push(node);
+}
+
+unsigned HandleHeap::protectedGlobalObjectCount()
+{
+    unsigned count = 0;
+    Node* end = m_strongList.end();
+    for (Node* node = m_strongList.begin(); node != end; node = node->next()) {
+        JSValue value = *node->slot();
+        if (value.isObject() && asObject(value.asCell())->isGlobalObject())
+            count++;
+    }
+    return count;
+}
+
+}