Changeset 37160 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Oct 1, 2008, 3:18:50 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-01 Cameron Zwarich <​[email protected]>

Reviewed by Darin Adler.

Bug 21123: using "arguments" in a function should not force creation of an activation object
<​https://bugs.webkit.org/show_bug.cgi?id=21123>

Make the 'arguments' object not require a JSActivation. We store the
'arguments' object in the OptionalCalleeArguments call frame slot. We
need to be able to get the original 'arguments' object to tear it off
when returning from a function, but 'arguments' may be assigned to in a
number of ways.

Therefore, we use the OptionalCalleeArguments slot when we want to get
the original activation or we know that 'arguments' was not assigned a
different value. When 'arguments' may have been assigned a new value,
we use a new local variable that is initialized with 'arguments'. Since
a function parameter named 'arguments' may overwrite the value of
'arguments', we also need to be careful to look up 'arguments' in the
symbol table, so we get the parameter named 'arguments' instead of the
local variable that we have added for holding the 'arguments' object.

This is a 19.1% win on the V8 Raytrace benchmark using the SunSpider
harness, and a 20.7% win using the V8 harness. This amounts to a 6.5%
total speedup on the V8 benchmark suite using the V8 harness.

JavaScriptCore:

• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass):
• VM/CodeBlock.h:
• VM/CodeGenerator.cpp: (JSC::CodeGenerator::CodeGenerator):
• VM/Machine.cpp: (JSC::Machine::unwindCallFrame): (JSC::Machine::privateExecute): (JSC::Machine::retrieveArguments): (JSC::Machine::cti_op_init_arguments): (JSC::Machine::cti_op_ret_activation_arguments):
• VM/Machine.h:
• VM/RegisterFile.h: (JSC::RegisterFile::):
• kjs/Arguments.cpp: (JSC::Arguments::mark): (JSC::Arguments::fillArgList): (JSC::Arguments::getOwnPropertySlot): (JSC::Arguments::put):
• kjs/Arguments.h: (JSC::Arguments::setRegisters): (JSC::Arguments::init): (JSC::Arguments::Arguments): (JSC::Arguments::copyRegisters): (JSC::JSActivation::copyRegisters):
• kjs/JSActivation.cpp: (JSC::JSActivation::argumentsGetter):
• kjs/JSActivation.h: (JSC::JSActivation::JSActivationData::JSActivationData):
• kjs/grammar.y:
• kjs/nodes.h: (JSC::ScopeNode::setUsesArguments):
• masm/X86Assembler.h: (JSC::X86Assembler::): (JSC::X86Assembler::orl_mr):

LayoutTests:

• fast/js/arguments-expected.txt:
• fast/js/function-dot-arguments-expected.txt:
• fast/js/resources/arguments.js:
• fast/js/resources/function-dot-arguments.js:

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (5 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -802 +802 @@
         scopeChain->deref();
 
-    // If this call frame created an activation, tear it off.
-    if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].jsValue(exec))) {
+    // If this call frame created an activation or an 'arguments' object, tear it off.
+    if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue())) {
         ASSERT(activation->isObject(&JSActivation::info));
-        activation->copyRegisters();
+        activation->copyRegisters(r[RegisterFile::OptionalCalleeArguments].getJSValue());
+    } else if (Arguments* arguments = static_cast<Arguments*>(r[RegisterFile::OptionalCalleeArguments].getJSValue())) {
+        ASSERT(arguments->isObject(&Arguments::info));
+        arguments->copyRegisters();
     }
     
@@ -3361 +3364 @@
         int result = (++vPC)->u.operand;
 
-        if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].jsValue(exec))) {
+        // If this call frame created an activation or an 'arguments' object, tear it off.
+        if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue())) {
             ASSERT(!codeBlock(r)->needsFullScopeChain || scopeChain(r)->object == activation);
             ASSERT(activation->isObject(&JSActivation::info));
-            activation->copyRegisters();
+            activation->copyRegisters(r[RegisterFile::OptionalCalleeArguments].getJSValue());
+        } else if (Arguments* arguments = static_cast<Arguments*>(r[RegisterFile::OptionalCalleeArguments].getJSValue())) {
+            ASSERT(arguments->isObject(&Arguments::info));
+            arguments->copyRegisters();
         }
 
@@ -3418 +3425 @@
     }
     BEGIN_OPCODE(op_init_arguments) {
-        JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue());
-        r[RegisterFile::OptionalCalleeArguments] = activation->createArgumentsObject(exec);
+        JSValue* activation = r[RegisterFile::OptionalCalleeActivation].getJSValue();
+        Arguments* arguments;
+        if (activation) {
+            ASSERT(activation->isObject(&JSActivation::info));
+            arguments = new (exec) Arguments(exec, static_cast<JSActivation*>(activation));
+        } else
+            arguments = new (exec) Arguments(exec, r);
+        r[RegisterFile::OptionalCalleeArguments] = arguments;
+        r[RegisterFile::ArgumentsRegister] = arguments;
+        
         ++vPC;
         NEXT_OPCODE;
@@ -3849 +3864 @@
         return jsNull();
 
-    Arguments* arguments = static_cast<Arguments*>(r[RegisterFile::OptionalCalleeArguments].jsValue(exec));
-    if (!arguments) {
-        JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue());
-        if (!activation) {
-            activation = new (exec) JSActivation(exec, function->m_body, r);
-            r[RegisterFile::OptionalCalleeActivation] = activation;
-        }
-
-        arguments = activation->createArgumentsObject(exec);
-        r[RegisterFile::OptionalCalleeArguments] = arguments;
+    JSValue* arguments;
+    CodeBlock* codeBlock = Machine::codeBlock(r);
+    if (codeBlock->usesArguments) {
+        ASSERT(codeBlock->codeType == FunctionCode);
+        SymbolTable& symbolTable = static_cast<FunctionBodyNode*>(codeBlock->ownerNode)->symbolTable();
+        int argumentsIndex = symbolTable.get(exec->propertyNames().arguments.ustring().rep()).getIndex();
+        arguments = r[argumentsIndex].jsValue(exec);
+    } else {
+        arguments = r[RegisterFile::OptionalCalleeArguments].getJSValue();
+        if (!arguments) {
+            JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue());
+            if (activation)
+                arguments = new (exec) Arguments(exec, activation);
+            else
+                arguments = new (exec) Arguments(exec, r);
+            r[RegisterFile::OptionalCalleeArguments] = arguments;
+        }
+        ASSERT(arguments->isObject(&Arguments::info));
     }
 
@@ -4600 +4623 @@
     ExecState* exec = ARG_exec;
     Register* r = ARG_r;
-    JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue());
-    r[RegisterFile::OptionalCalleeArguments] = activation->createArgumentsObject(exec);
-}
-
-void Machine::cti_op_ret_activation(CTI_ARGS)
-{
-    ExecState* exec = ARG_exec;
+
+    JSValue* activation = r[RegisterFile::OptionalCalleeActivation].getJSValue();
+    Arguments* arguments;
+    if (activation) {
+        ASSERT(activation->isObject(&JSActivation::info));
+        arguments = new (exec) Arguments(exec, static_cast<JSActivation*>(activation));
+    } else
+        arguments = new (exec) Arguments(exec, r);
+    r[RegisterFile::OptionalCalleeArguments] = arguments;
+    r[RegisterFile::ArgumentsRegister] = arguments;
+}
+
+void Machine::cti_op_ret_activation_arguments(CTI_ARGS)
+{
     Register* r = ARG_r;
 
-    JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].jsValue(exec));
-    ASSERT(activation);
-
-    ASSERT(!codeBlock(r)->needsFullScopeChain || scopeChain(r)->object == activation);
-    ASSERT(activation->isObject(&JSActivation::info));
-    activation->copyRegisters();
+    // If this call frame created an activation or an 'arguments' object, tear it off.
+    if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].getJSValue())) {
+        ASSERT(!codeBlock(r)->needsFullScopeChain || scopeChain(r)->object == activation);
+        ASSERT(activation->isObject(&JSActivation::info));
+        activation->copyRegisters(r[RegisterFile::OptionalCalleeArguments].getJSValue());
+    } else if (Arguments* arguments = static_cast<Arguments*>(r[RegisterFile::OptionalCalleeArguments].getJSValue())) {
+        ASSERT(arguments->isObject(&Arguments::info));
+        arguments->copyRegisters();
+    }
 }