Changeset 110138 in webkit

Timestamp:

Mar 7, 2012 8:04:40 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r110127.
​http://trac.webkit.org/changeset/110127
​https://bugs.webkit.org/show_bug.cgi?id=80562

compile failed on AppleWin (Requested by ukai on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-03-07

• heap/Heap.cpp:

(JSC::Heap::collectAllGarbage):

• heap/Heap.h:

(JSC):
(Heap):

• runtime/Executable.cpp:

(JSC::FunctionExecutable::FunctionExecutable):
(JSC::FunctionExecutable::finalize):

• runtime/Executable.h:

(FunctionExecutable):
(JSC::FunctionExecutable::create):

• runtime/JSGlobalData.cpp:

(WTF):
(Recompiler):
(WTF::Recompiler::operator()):
(JSC::JSGlobalData::recompileAllJSFunctions):
(JSC):

• runtime/JSGlobalData.h:

(JSGlobalData):

• runtime/JSGlobalObject.cpp:

(JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (3 diffs)
• heap/Heap.h (modified) (4 diffs)
• runtime/Executable.cpp (modified) (3 diffs)
• runtime/Executable.h (modified) (4 diffs)
• runtime/JSGlobalData.cpp (modified) (2 diffs)
• runtime/JSGlobalData.h (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-03-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r110127.
+        http://trac.webkit.org/changeset/110127
+        https://bugs.webkit.org/show_bug.cgi?id=80562
+
+        compile failed on AppleWin (Requested by ukai on #webkit).
+
+        * heap/Heap.cpp:
+        (JSC::Heap::collectAllGarbage):
+        * heap/Heap.h:
+        (JSC):
+        (Heap):
+        * runtime/Executable.cpp:
+        (JSC::FunctionExecutable::FunctionExecutable):
+        (JSC::FunctionExecutable::finalize):
+        * runtime/Executable.h:
+        (FunctionExecutable):
+        (JSC::FunctionExecutable::create):
+        * runtime/JSGlobalData.cpp:
+        (WTF):
+        (Recompiler):
+        (WTF::Recompiler::operator()):
+        (JSC::JSGlobalData::recompileAllJSFunctions):
+        (JSC):
+        * runtime/JSGlobalData.h:
+        (JSGlobalData):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope):
+
 2012-03-07  Hojong Han  <hojong.han@samsung.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -765 +765 @@
 }
 
-void Heap::discardAllCompiledCode()
-{
-    // If JavaScript is running, it's not safe to recompile, since we'll end
-    // up throwing away code that is live on the stack.
-    ASSERT(!m_globalData->dynamicGlobalObject);
-    
-    for (FunctionExecutable* current = m_functions.head(); current; current = current->next())
-        current->discardCode();
-}
-
 void Heap::collectAllGarbage()
 {
@@ -780 +770 @@
         return;
     if (!m_globalData->dynamicGlobalObject)
-        discardAllCompiledCode();
+        m_globalData->recompileAllJSFunctions();
 
     collect(DoSweep);
@@ -935 +925 @@
 }
 
-void Heap::addFunctionExecutable(FunctionExecutable* executable)
-{
-    m_functions.append(executable);
-}
-
-void Heap::removeFunctionExecutable(FunctionExecutable* executable)
-{
-    m_functions.remove(executable);
-}
-
 } // namespace JSC

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -43 +43 @@
     class CopiedSpace;
     class CodeBlock;
-    class FunctionExecutable;
     class GCActivityCallback;
     class GlobalCodeBlock;
@@ -107 +106 @@
         typedef void (*Finalizer)(JSCell*);
         JS_EXPORT_PRIVATE void addFinalizer(JSCell*, Finalizer);
-        void addFunctionExecutable(FunctionExecutable*);
-        void removeFunctionExecutable(FunctionExecutable*);
 
         void notifyIsSafeToCollect() { m_isSafeToCollect = true; }
@@ -143 +140 @@
 
         double lastGCLength() { return m_lastGCLength; }
-
-        void discardAllCompiledCode();
 
     private:
@@ -245 +240 @@
         JSGlobalData* m_globalData;
         double m_lastGCLength;
-
-        DoublyLinkedList<FunctionExecutable> m_functions;
     };
 

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -147 +147 @@
     , m_inferredName(inferredName.isNull() ? globalData.propertyNames->emptyIdentifier : inferredName)
     , m_symbolTable(0)
-    , m_next(0)
-    , m_prev(0)
 {
 }
@@ -160 +158 @@
     , m_inferredName(inferredName.isNull() ? exec->globalData().propertyNames->emptyIdentifier : inferredName)
     , m_symbolTable(0)
-    , m_next(0)
-    , m_prev(0)
 {
 }
@@ -659 +655 @@
 void FunctionExecutable::finalize(JSCell* cell)
 {
-    FunctionExecutable* executable = jsCast<FunctionExecutable*>(cell);
-    Heap::heap(executable)->removeFunctionExecutable(executable);
-    executable->clearCode();
+    jsCast<FunctionExecutable*>(cell)->clearCode();
 }
 

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -464 +464 @@
     };
 
-    class FunctionExecutable : public ScriptExecutable, public DoublyLinkedListNode<FunctionExecutable> {
+    class FunctionExecutable : public ScriptExecutable {
         friend class JIT;
         friend class LLIntOffsetsExtractor;
-        friend class DoublyLinkedListNode<FunctionExecutable>;
     public:
         typedef ScriptExecutable Base;
@@ -475 +474 @@
             FunctionExecutable* executable = new (NotNull, allocateCell<FunctionExecutable>(*exec->heap())) FunctionExecutable(exec, name, inferredName, source, forceUsesArguments, parameters, isInStrictContext);
             executable->finishCreation(exec->globalData(), name, firstLine, lastLine);
-            exec->globalData().heap.addFunctionExecutable(executable);
             exec->globalData().heap.addFinalizer(executable, &finalize);
             return executable;
@@ -484 +482 @@
             FunctionExecutable* executable = new (NotNull, allocateCell<FunctionExecutable>(globalData.heap)) FunctionExecutable(globalData, name, inferredName, source, forceUsesArguments, parameters, isInStrictContext);
             executable->finishCreation(globalData, name, firstLine, lastLine);
-            globalData.heap.addFunctionExecutable(executable);
             globalData.heap.addFinalizer(executable, &finalize);
             return executable;
@@ -692 +689 @@
         WriteBarrier<JSString> m_nameValue;
         SharedSymbolTable* m_symbolTable;
-        FunctionExecutable* m_next;
-        FunctionExecutable* m_prev;
     };
 

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -69 +69 @@
 using namespace WTF;
 
+namespace {
+
+using namespace JSC;
+
+class Recompiler : public MarkedBlock::VoidFunctor {
+public:
+    void operator()(JSCell*);
+};
+
+inline void Recompiler::operator()(JSCell* cell)
+{
+    if (!cell->inherits(&JSFunction::s_info))
+        return;
+    JSFunction* function = asFunction(cell);
+    if (!function->executable() || function->executable()->isHostFunction())
+        return;
+    function->jsExecutable()->discardCode();
+}
+
+} // namespace
+
 namespace JSC {
 
@@ -423 +444 @@
 }
 
+void JSGlobalData::recompileAllJSFunctions()
+{
+    // If JavaScript is running, it's not safe to recompile, since we'll end
+    // up throwing away code that is live on the stack.
+    ASSERT(!dynamicGlobalObject);
+    
+    heap.objectSpace().forEachCell<Recompiler>();
+}
+
 struct StackPreservingRecompiler : public MarkedBlock::VoidFunctor {
     HashSet<FunctionExecutable*> currentlyExecutingFunctions;

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -325 +325 @@
         JS_EXPORT_PRIVATE void stopSampling();
         JS_EXPORT_PRIVATE void dumpSampleData(ExecState* exec);
-        void discardAllCompiledCode();
+        void recompileAllJSFunctions();
         RegExpCache* regExpCache() { return m_regExpCache; }
 #if ENABLE(REGEXP_TRACING)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -461 +461 @@
 #if ENABLE(ASSEMBLER)
         if (ExecutableAllocator::underMemoryPressure())
-            globalData.heap.discardAllCompiledCode();
+            globalData.recompileAllJSFunctions();
 #endif