Changeset 179887 in webkit for trunk/Source/JavaScriptCore/runtime/Arguments.cpp

Timestamp:

Feb 10, 2015, 3:16:36 PM (10 years ago)

Author:

[email protected]

Message:

op_call_varargs should only load the length once
​https://bugs.webkit.org/show_bug.cgi?id=141440
rdar://problem/19761683

Reviewed by Michael Saboff.

Refactors the pair of calls that set up the varargs frame so that the first call returns the
length, and the second call uses the length returned by the first one. It turns out that this
gave me an opportunity to shorten a lot of the code.

• interpreter/Interpreter.cpp:

(JSC::sizeFrameForVarargs):
(JSC::loadVarargs):
(JSC::setupVarargsFrame):
(JSC::setupVarargsFrameAndSetThis):

• interpreter/Interpreter.h:

(JSC::calleeFrameForVarargs):

• jit/CCallHelpers.h:

(JSC::CCallHelpers::setupArgumentsWithExecState):

• jit/JIT.h:
• jit/JITCall.cpp:

(JSC::JIT::compileSetupVarargsFrame):

• jit/JITCall32_64.cpp:

(JSC::JIT::compileSetupVarargsFrame):

• jit/JITInlines.h:

(JSC::JIT::callOperation):

• jit/JITOperations.cpp:
• jit/JITOperations.h:
• jit/SetupVarargsFrame.cpp:

(JSC::emitSetVarargsFrame):
(JSC::emitSetupVarargsFrameFastCase):

• jit/SetupVarargsFrame.h:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• runtime/Arguments.cpp:

(JSC::Arguments::copyToArguments):

• runtime/Arguments.h:
• runtime/JSArray.cpp:

(JSC::JSArray::copyToArguments):

• runtime/JSArray.h:
• runtime/VM.h:
• tests/stress/call-varargs-length-effects.js: Added.

(foo):
(bar):

File:

• trunk/Source/JavaScriptCore/runtime/Arguments.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/Arguments.cpp

@@ -88 +88 @@
 static EncodedJSValue JSC_HOST_CALL argumentsFuncIterator(ExecState*);
 
-void Arguments::copyToArguments(ExecState* exec, VirtualRegister firstElementDest, uint32_t copyLength, int32_t firstVarArgOffset)
-{
-    uint32_t length = copyLength + firstVarArgOffset;
-
-    if (UNLIKELY(m_overrodeLength)) {
-        length = min(get(exec, exec->propertyNames().length).toUInt32(exec), length);
-        for (unsigned i = firstVarArgOffset; i < length; i++)
-            exec->r(firstElementDest + i - firstVarArgOffset) = get(exec, i);
-        return;
-    }
-    ASSERT(length == this->length(exec));
-    for (size_t i = firstVarArgOffset; i < length; ++i) {
-        if (JSValue value = tryGetArgument(i))
-            exec->r(firstElementDest + i - firstVarArgOffset) = value;
+void Arguments::copyToArguments(ExecState* exec, VirtualRegister firstElementDest, unsigned offset, unsigned length)
+{
+    for (unsigned i = 0; i < length; ++i) {
+        if (JSValue value = tryGetArgument(i + offset))
+            exec->r(firstElementDest + i) = value;
         else {
-            exec->r(firstElementDest + i - firstVarArgOffset) = get(exec, i);
+            exec->r(firstElementDest + i) = get(exec, i + offset);
             if (UNLIKELY(exec->vm().exception()))
                 return;