Changeset 35445 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Jul 30, 2008, 1:00:19 AM (17 years ago)

Author:

[email protected]

Message:

<rdar://problem/6111648> JavaScript exceptions fail if the scope chain includes the global object

Reviewed by Alexey Proskuryakov.

In an attempt to remove the branch I just added to KJS::depth I
used the existence of a Variable Object at a point in the scope
chain as an indicator of function or global scope activation.
However this assumption results in incorrect behaviour if the
global object is injected into the scope chain with 'with'.

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (1 diff)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -86 +86 @@
     ScopeChainIterator iter = sc.begin();
     ScopeChainIterator end = sc.end();
-    while (!(*iter)->isVariableObject()) {
+    while (!(*iter)->isActivationObject()) {
         ++iter;
+        if (iter == end)
+            break;
         ++scopeDepth;
     }