Changeset 28545 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 7, 2007, 4:23:31 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam Weinig.

Fixed crash seen running layout tests.

Reverted a change I made earlier today. Added a comment to try to
discourage myself from making this mistake a third time.

• kjs/function.cpp: (KJS::ActivationImp::mark):
• kjs/function.h: (KJS::ActivationImp::ActivationImpData::ActivationImpData):

Location:

trunk/JavaScriptCore/kjs

Files:

• function.cpp (modified) (1 diff)
• function.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -421 +421 @@
 {
     JSVariableObject::mark();
+    
+    if (!d()->function->marked())
+        d()->function->mark();
 
     if (d()->argumentsObject && !d()->argumentsObject->marked())

trunk/JavaScriptCore/kjs/function.h

@@ -147 +147 @@
             : JSVariableObjectData(&e->function()->body->symbolTable())
             , exec(e)
+            , function(e->function()) // Store this pointer for marking, to keep our symbol table / scope alive after exec has gone out of scope.
             , argumentsObject(0)
         {
@@ -152 +153 @@
 
         ExecState* exec;
+        FunctionImp* function;
         Arguments* argumentsObject;
     };