Changeset 76090 in webkit for trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

Timestamp:

Jan 18, 2011, 6:37:59 PM (15 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/runtime/JSActivation.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -204 +204 @@
     CallFrame* callFrame = CallFrame::create(activation->d()->registers);
     int argumentsRegister = activation->d()->functionExecutable->generatedBytecode().argumentsRegister();
-    if (!callFrame->uncheckedR(argumentsRegister).jsValue()) {
-        JSValue arguments = JSValue(new (callFrame) Arguments(callFrame));
-        callFrame->uncheckedR(argumentsRegister) = arguments;
-        callFrame->uncheckedR(unmodifiedArgumentsRegister(argumentsRegister)) = arguments;
-    }
-
-    ASSERT(callFrame->uncheckedR(argumentsRegister).jsValue().inherits(&Arguments::info));
-    return callFrame->uncheckedR(argumentsRegister).jsValue();
+    if (JSValue arguments = callFrame->uncheckedR(argumentsRegister).jsValue())
+        return arguments;
+    int realArgumentsRegister = unmodifiedArgumentsRegister(argumentsRegister);
+
+    JSValue arguments = JSValue(new (callFrame) Arguments(callFrame));
+    callFrame->uncheckedR(argumentsRegister) = arguments;
+    callFrame->uncheckedR(realArgumentsRegister) = arguments;
+    
+    ASSERT(callFrame->uncheckedR(realArgumentsRegister).jsValue().inherits(&Arguments::info));
+    return callFrame->uncheckedR(realArgumentsRegister).jsValue();
 }