Changeset 9390 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Jun 14, 2005, 9:36:11 AM (20 years ago)

Author:

ggaren

Message:

Fixed: <rdar://problem/4147745> JavaScript discards locally defined "arguments" property

No layout tests added because this change fixes existing tests:
ecma/ExecutionContexts/10.1.6.js
ecma_3/Function/regress-94506.js
js1_4/Functions/function-001.js

Reviewed by cblu.

• kjs/function.cpp: (KJS::ActivationImp::get): get now checks for an "arguments" property defined in the local variable object before trying to return the built-in arguments array.

• kjs/function.h: ActivationImp::put no longer overrides ObjectImp::put

File:

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

trunk/JavaScriptCore/kjs/function.cpp

@@ -345 +345 @@
 {
     if (propertyName == argumentsPropertyName) {
+        // check for locally declared arguments property
+        ValueImp *v = getDirect(propertyName);
+        if (v)
+            return Value(v);
+
+        // default: return builtin arguments array
         if (!_argumentsObject)
-            createArgumentsObject(exec);
+                createArgumentsObject(exec);
         return Value(_argumentsObject);
     }
     return ObjectImp::get(exec, propertyName);
-}
-
-void ActivationImp::put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr)
-{
-    if (propertyName == argumentsPropertyName) {
-        // FIXME: Do we need to allow overwriting this?
-        return;
-    }
-    ObjectImp::put(exec, propertyName, value, attr);
 }