Changeset 98365 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

Timestamp:

Oct 25, 2011, 11:17:37 AM (14 years ago)

Author:

[email protected]

Message:

Need to support marking of multiple nested codeblocks when compiling
​https://bugs.webkit.org/show_bug.cgi?id=70832

Reviewed by Gavin Barraclough.

When inlining a function we end up with multiple codeblocks being
compiled at the same time, so we need to support a list of live
codeblocks.

• heap/Heap.cpp:

(JSC::Heap::markRoots):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::JSGlobalData):

• runtime/JSGlobalData.h:

(JSC::JSGlobalData::startedCompiling):
(JSC::JSGlobalData::finishedCompiling):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalData.h (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -189 +189 @@
         NumericStrings numericStrings;
         DateInstanceCache dateInstanceCache;
-        CodeBlock* codeBlockBeingCompiled;
+        Vector<CodeBlock*> codeBlocksBeingCompiled;
         void startedCompiling(CodeBlock* codeBlock)
         {
-            ASSERT(!codeBlockBeingCompiled);
-            codeBlockBeingCompiled = codeBlock;
+            codeBlocksBeingCompiled.append(codeBlock);
         }
 
         void finishedCompiling(CodeBlock* codeBlock)
         {
-            ASSERT_UNUSED(codeBlock, codeBlock == codeBlockBeingCompiled);
-            codeBlockBeingCompiled = 0;
+            ASSERT_UNUSED(codeBlock, codeBlock == codeBlocksBeingCompiled.last());
+            codeBlocksBeingCompiled.removeLast();
         }