Changeset 29431 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 12, 2008, 3:03:30 AM (18 years ago)

Author:

[email protected]

Message:

Reviewed by Maciej.

Fixes a problem with the ActivationImp tear-off patch (r29425) where
some of the calls to JSGlobalObject::tearOffActivation() were using
the wrong test to determine whether it should leave a relic behind.

• kjs/function.cpp: (KJS::FunctionImp::argumentsGetter): (KJS::ActivationImp::getOwnPropertySlot):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/function.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-01-12  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Maciej.
+
+        Fixes a problem with the ActivationImp tear-off patch (r29425) where
+        some of the calls to JSGlobalObject::tearOffActivation() were using
+        the wrong test to determine whether it should leave a relic behind.
+
+        * kjs/function.cpp:
+        (KJS::FunctionImp::argumentsGetter):
+        (KJS::ActivationImp::getOwnPropertySlot):
+
 2008-01-11  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/function.cpp

@@ -89 +89 @@
   for (ExecState* e = exec; e; e = e->callingExecState())
     if (e->function() == thisObj) {
-      e->dynamicGlobalObject()->tearOffActivation(e, e == exec);
+      e->dynamicGlobalObject()->tearOffActivation(e, e != exec);
       return e->activationObject()->get(exec, propertyName);
     }
@@ -392 +392 @@
         for (ExecState* e = exec; e; e = e->callingExecState())
             if (e->function() == d()->function) {
-                e->dynamicGlobalObject()->tearOffActivation(e, e == exec);
+                e->dynamicGlobalObject()->tearOffActivation(e, e != exec);
                 ActivationImp* newActivation = e->activationObject();
                 slot.setCustom(newActivation, newActivation->getArgumentsGetter());