Changeset 39951 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jan 15, 2009, 3:49:55 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-15 Sam Weinig <​[email protected]>

Reviewed by Gavin Barraclough.

Fix crash seen running fast/canvas.

Make sure to mark the ScopeNode and CodeBlock being created
in the re-parse for exception information.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::reparseForExceptionInfoIfNecessary):
• parser/Nodes.h: (JSC::ScopeNode::mark):
• runtime/Collector.cpp: (JSC::Heap::collect):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• runtime/JSGlobalData.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• Collector.cpp (modified) (1 diff)
• JSGlobalData.cpp (modified) (1 diff)
• JSGlobalData.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -987 +987 @@
     m_globalData->interpreter->registerFile().markCallFrames(this);
     m_globalData->smallStrings.mark();
+    if (m_globalData->scopeNodeBeingReparsed)
+        m_globalData->scopeNodeBeingReparsed->mark();
 
     JAVASCRIPTCORE_GC_MARKED();

trunk/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -92 +92 @@
     , isSharedInstance(isShared)
     , clientData(0)
+    , scopeNodeBeingReparsed(0)
     , heap(this)
 {

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -47 +47 @@
     class Heap;
     class IdentifierTable;
+    class Interpreter;
     class JSGlobalObject;
     class JSObject;
     class Lexer;
-    class Interpreter;
     class Parser;
     class ParserRefCounted;
+    class ScopeNode;
     class Structure;
     class UString;
@@ -121 +122 @@
         HashSet<JSObject*> arrayVisitedElements;
 
+        ScopeNode* scopeNodeBeingReparsed;
+
         Heap heap;
 #if ENABLE(ASSEMBLER)