Changeset 76090 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Jan 18, 2011, 6:37:59 PM (14 years ago)

Author:

[email protected]

Message:

2011-01-18 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

[jsfunfuzz] Assertion asking activation for arguments when arguments is overridden
​https://bugs.webkit.org/show_bug.cgi?id=52690

Add a few more tests.

• fast/js/function-dot-arguments-expected.txt:
• fast/js/script-tests/function-dot-arguments.js: (overwroteArgumentsInDynamicScope1): (overwroteArgumentsInDynamicScope2): (overwroteArgumentsInDynamicScope3):

2011-01-18 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

[jsfunfuzz] Assertion asking activation for arguments when arguments is overridden
​https://bugs.webkit.org/show_bug.cgi?id=52690

Clean up code to retrieve arguments from activation and function objects.
Remove the incorrect assertion from JSActivation's argumentsGetter.

• interpreter/Interpreter.cpp: (JSC::Interpreter::retrieveArguments):
• runtime/JSActivation.cpp: (JSC::JSActivation::argumentsGetter):

File:

• trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -4803 +4803 @@
         ASSERT(codeBlock->codeType() == FunctionCode);
         int argumentsRegister = codeBlock->argumentsRegister();
-        if (!functionCallFrame->r(argumentsRegister).jsValue()) {
-            JSValue arguments = JSValue(new (callFrame) Arguments(functionCallFrame));
-            functionCallFrame->r(argumentsRegister) = arguments;
-            functionCallFrame->r(unmodifiedArgumentsRegister(argumentsRegister)) = arguments;
-        }
-        return functionCallFrame->r(argumentsRegister).jsValue();
+        int realArgumentsRegister = unmodifiedArgumentsRegister(argumentsRegister);
+        if (JSValue arguments = functionCallFrame->uncheckedR(argumentsRegister).jsValue())
+            return arguments;
+        JSValue arguments = JSValue(new (callFrame) Arguments(functionCallFrame));
+        functionCallFrame->r(argumentsRegister) = arguments;
+        functionCallFrame->r(realArgumentsRegister) = arguments;
+        return arguments;
     }