Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)

New snapshot that should work with the latest Qt build system changes

1 files changed, 11 insertions, 2 deletions

diff --git a/Source/JavaScriptCore/heap/MarkStack.h b/Source/JavaScriptCore/heap/MarkStack.h
index c3065e7d6..ff25531a4 100644
--- a/Source/JavaScriptCore/heap/MarkStack.h
+++ b/Source/JavaScriptCore/heap/MarkStack.h
@@ -219,6 +219,8 @@ namespace JSC {
         
         MarkStackSegmentAllocator m_segmentAllocator;
         
+        bool m_shouldHashConst;
+
         Vector<ThreadIdentifier> m_markingThreads;
         Vector<MarkStack*> m_markingThreadsMarkStack;
         
@@ -259,6 +261,7 @@ namespace JSC {
         MarkStackThreadSharedData& sharedData() { return m_shared; }
         bool isEmpty() { return m_stack.isEmpty(); }
 
+        void setup();
         void reset();
 
         size_t visitCount() const { return m_visitCount; }
@@ -292,6 +295,7 @@ namespace JSC {
 
         void internalAppend(JSCell*);
         void internalAppend(JSValue);
+        void internalAppend(JSValue*);
         
         JS_EXPORT_PRIVATE void mergeOpaqueRoots();
         
@@ -304,7 +308,7 @@ namespace JSC {
         
         void mergeOpaqueRootsIfProfitable()
         {
-            if (static_cast<unsigned>(m_opaqueRoots.size()) < Options::opaqueRootMergeThreshold)
+            if (static_cast<unsigned>(m_opaqueRoots.size()) < Options::opaqueRootMergeThreshold())
                 return;
             mergeOpaqueRoots();
         }
@@ -325,6 +329,10 @@ namespace JSC {
         
         MarkStackThreadSharedData& m_shared;
 
+        bool m_shouldHashConst; // Local per-thread copy of shared flag for performance reasons
+        typedef HashMap<StringImpl*, JSValue> UniqueStringMap;
+        UniqueStringMap m_uniqueStrings;
+
 #if ENABLE(OBJECT_MARK_LOGGING)
         unsigned m_logChildCount;
 #endif
@@ -339,6 +347,7 @@ namespace JSC {
         , m_visitCount(0)
         , m_isInParallelMode(false)
         , m_shared(shared)
+        , m_shouldHashConst(false)
     {
     }
 
@@ -350,7 +359,7 @@ namespace JSC {
     inline void MarkStack::addOpaqueRoot(void* root)
     {
 #if ENABLE(PARALLEL_GC)
-        if (Options::numberOfGCMarkers == 1) {
+        if (Options::numberOfGCMarkers() == 1) {
             // Put directly into the shared HashSet.
             m_shared.m_opaqueRoots.add(root);
             return;