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

Timestamp:

Oct 24, 2011, 5:21:29 PM (14 years ago)

Author:

[email protected]

Message:

Crash in void JSC::validateCell<JSC::RegExp*>(JSC::RegExp*)
​https://bugs.webkit.org/show_bug.cgi?id=70689

Reviewed by Filip Pizlo.

While performing codegen we need to make the GlobalData explicitly
aware of the codeblock being compiled, as compilation may trigger GC
and CodeBlock holds GC values, but has not yet been assigned to its
owner executable.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::~BytecodeGenerator):

• bytecompiler/BytecodeGenerator.h:
• heap/AllocationSpace.cpp:

(JSC::AllocationSpace::allocateSlowCase):

• 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;
+        void startedCompiling(CodeBlock* codeBlock)
+        {
+            ASSERT(!codeBlockBeingCompiled);
+            codeBlockBeingCompiled = codeBlock;
+        }
+
+        void finishedCompiling(CodeBlock* codeBlock)
+        {
+            ASSERT_UNUSED(codeBlock, codeBlock == codeBlockBeingCompiled);
+            codeBlockBeingCompiled = 0;
+        }
+
 #if ENABLE(ASSEMBLER)
         ExecutableAllocator executableAllocator;