Changeset 91869 in webkit

Timestamp:

Jul 27, 2011 2:44:49 PM (13 years ago)

Author:

Stephanie Lewis

Message:

Revert ​http://trac.webkit.org/changeset/90415.
Caused a 5% sunspider regression in-browser.

Unreviewed rollout.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::visitAggregate):

• heap/Heap.cpp:

(JSC::Heap::collectAllGarbage):

• heap/MarkStack.h:

(JSC::MarkStack::MarkStack):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::releaseExecutableMemory):

• runtime/RegExp.cpp:

(JSC::RegExp::compile):
(JSC::RegExp::invalidateCode):

• runtime/RegExp.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)
• heap/MarkStack.h (modified) (3 diffs)
• runtime/JSGlobalData.cpp (modified) (1 diff)
• runtime/RegExp.cpp (modified) (4 diffs)
• runtime/RegExp.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-27  Stephanie Lewis  <slewis@apple.com>
+
+        Revert http://trac.webkit.org/changeset/90415.
+        Caused a 5% sunspider regression in-browser.
+
+        Unreviewed rollout.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::visitAggregate):
+        * heap/Heap.cpp:
+        (JSC::Heap::collectAllGarbage):
+        * heap/MarkStack.h:
+        (JSC::MarkStack::MarkStack):
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::releaseExecutableMemory):
+        * runtime/RegExp.cpp:
+        (JSC::RegExp::compile):
+        (JSC::RegExp::invalidateCode):
+        * runtime/RegExp.h:
+
 2011-07-27  Shinya Kawanaka  <shinyak@google.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1547 +1547 @@
         visitor.append(&m_functionDecls[i]);
 #if ENABLE(JIT)
-    if (visitor.shouldUnlinkCalls())
-        unlinkCalls();
     for (unsigned i = 0; i < numberOfCallLinkInfos(); ++i)
         if (callLinkInfo(i).isLinked())

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -540 +540 @@
     if (!m_isSafeToCollect)
         return;
-    m_slotVisitor.setShouldUnlinkCalls(true);
+    if (!m_globalData->dynamicGlobalObject)
+        m_globalData->recompileAllJSFunctions();
+
     collect(DoSweep);
-    m_slotVisitor.setShouldUnlinkCalls(false);
 }
 

trunk/Source/JavaScriptCore/heap/MarkStack.h

@@ -98 +98 @@
         void reset();
 
-        bool shouldUnlinkCalls() const { return m_shouldUnlinkCalls; }
-        void setShouldUnlinkCalls(bool shouldUnlinkCalls) { m_shouldUnlinkCalls = shouldUnlinkCalls; }
-
     protected:
 #if ENABLE(GC_VALIDATION)
@@ -124 +121 @@
         bool m_isDraining;
 #endif
-
-    private:
-        bool m_shouldUnlinkCalls;
     };
 
@@ -135 +129 @@
         , m_isDraining(false)
 #endif
-        , m_shouldUnlinkCalls(false)
     {
     }

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -498 +498 @@
         }
         heap.forEachCell<StackPreservingRecompiler>(recompiler);
-    } else
-        recompileAllJSFunctions();
-
+    }
     m_regExpCache->invalidateCode();
     heap.collectAllGarbage();

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -114 +114 @@
     ASSERT(m_state == NotCompiled);
     m_representation = adoptPtr(new RegExpRepresentation);
-    m_state = Compiling;
     Yarr::YarrPattern pattern(m_patternString, ignoreCase(), multiline(), &m_constructionError);
     if (m_constructionError) {
@@ -125 +124 @@
 
     ASSERT(m_numSubpatterns == pattern.m_numSubpatterns);
+
+    m_state = ByteCode;
 
 #if ENABLE(YARR_JIT)
@@ -144 +145 @@
 
     m_representation->m_regExpBytecode = Yarr::byteCompile(pattern, &globalData->m_regExpAllocator);
-
-    m_state = ByteCode;
 }
 
@@ -206 +205 @@
 void RegExp::invalidateCode()
 {
-    if (!m_representation || m_state == Compiling)
+    if (!m_representation)
         return;
     m_state = NotCompiled;

trunk/Source/JavaScriptCore/runtime/RegExp.h

@@ -84 +84 @@
             JITCode,
             ByteCode,
-            NotCompiled,
-            Compiling
+            NotCompiled
         } m_state;