Changeset 21790 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

May 25, 2007, 4:50:00 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Darin.

• Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13456 REGRESSION: setTimeout "arguments" object gets shadowed by a local variable

• Add a explicit check for arguments. Previously check was done with getDirect, but since the arguments is created on-demand in ActivationImp, it doesn't show up in the test. 'arguments' should always be in the VarDeclNode's evaluation scope.

• kjs/nodes.cpp: (VarDeclNode::evaluate): Additional check if the var decl identifier is 'arguments'

LayoutTests:

Reviewed by Darin.

• Test cases for ​http://bugs.webkit.org/show_bug.cgi?id=13456 REGRESSION: setTimeout"arguments" object gets shadowed by a local variable

• fast/js/resources/vardecl-preserve-arguments.js: Added.
• fast/js/vardecl-preserve-arguments-expected.txt: Added.
• fast/js/vardecl-preserve-arguments.html: Added.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1599 +1599 @@
       // already declared? - check with getDirect so you can override
       // built-in properties of the global object with var declarations.
-      if (variable->getDirect(ident)) 
+      // Also check for 'arguments' property. The 'arguments' cannot be found with
+      // getDirect, because it's created lazily by
+      // ActivationImp::getOwnPropertySlot.
+      // Since variable declarations are always in function scope, 'variable'
+      // will always contain instance of ActivationImp and ActivationImp will
+      // always have 'arguments' property
+      if (variable->getDirect(ident) || ident == exec->propertyNames().arguments)
           return 0;
       val = jsUndefined();