Changeset 37324 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 5, 2008, 11:00:58 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Oliver Hunt.

Bug 21364: Remove the branch in op_ret for OptionalCalleeActivation and OptionalCalleeArguments
<​https://bugs.webkit.org/show_bug.cgi?id=21364>

Use information from the parser to detect whether an activation is
needed or 'arguments' is used, and emit explicit instructions to tear
them off before op_ret. This allows a branch to be removed from op_ret
and simplifies some other code. This does cause a small change in the
behaviour of 'f.arguments'; it is no longer live when 'arguments' is not
mentioned in the lexical scope of the function.

It should now be easy to remove the OptionaCalleeActivation slot in the
call frame, but this will be done in a later patch.

JavaScriptCore:

• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass):
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
• VM/CodeGenerator.cpp: (JSC::CodeGenerator::emitReturn):
• VM/CodeGenerator.h:
• VM/Machine.cpp: (JSC::Machine::unwindCallFrame): (JSC::Machine::privateExecute): (JSC::Machine::retrieveArguments): (JSC::Machine::cti_op_create_arguments): (JSC::Machine::cti_op_tear_off_activation): (JSC::Machine::cti_op_tear_off_arguments):
• VM/Machine.h:
• VM/Opcode.h:
• kjs/Arguments.cpp: (JSC::Arguments::mark):
• kjs/Arguments.h: (JSC::Arguments::isTornOff): (JSC::Arguments::Arguments): (JSC::Arguments::copyRegisters): (JSC::JSActivation::copyRegisters):
• kjs/JSActivation.cpp: (JSC::JSActivation::argumentsGetter):
• kjs/JSActivation.h:

LayoutTests:

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

Location:

trunk/JavaScriptCore/kjs

Files:

• Arguments.cpp (modified) (1 diff)
• Arguments.h (modified) (7 diffs)
• JSActivation.cpp (modified) (1 diff)
• JSActivation.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/Arguments.cpp

@@ -65 +65 @@
     if (!d->callee->marked())
         d->callee->mark();
-
-    if (d->activation && !d->activation->marked())
-        d->activation->mark();
 }
 

trunk/JavaScriptCore/kjs/Arguments.h

@@ -33 +33 @@
 
     struct ArgumentsData : Noncopyable {
-        JSActivation* activation;
-
         unsigned numParameters;
         ptrdiff_t firstParameterIndex;
@@ -55 +53 @@
     public:
         Arguments(ExecState*, Register* callFrame);
-        Arguments(ExecState*, JSActivation*);
         virtual ~Arguments();
 
@@ -65 +62 @@
 
         void copyRegisters();
+        bool isTornOff() const { return d->registerArray; }
         void setRegisters(Register* registers) { d->registers = registers; }
 
@@ -82 +80 @@
     };
 
-    inline void Arguments::init(ExecState* exec, Register* callFrame)
+    inline Arguments::Arguments(ExecState* exec, Register* callFrame)
+        : JSObject(exec->lexicalGlobalObject()->argumentsStructure())
+        , d(new ArgumentsData)
     {
         JSFunction* callee;
@@ -116 +116 @@
     }
 
-    inline Arguments::Arguments(ExecState* exec, Register* callFrame)
-        : JSObject(exec->lexicalGlobalObject()->argumentsStructure())
-        , d(new ArgumentsData)
-    {
-        d->activation = 0;
-        init(exec, callFrame);
-    }
-
-    inline Arguments::Arguments(ExecState* exec, JSActivation* activation)
-        : JSObject(exec->lexicalGlobalObject()->argumentsStructure())
-        , d(new ArgumentsData)
-    {
-        ASSERT(activation);
-        d->activation = activation;
-        init(exec, &activation->registerAt(0));
-    }
-
     inline void Arguments::copyRegisters()
     {
-        ASSERT(!d->activation);
-        ASSERT(!d->registerArray);
+        ASSERT(!isTornOff());
 
         if (!d->numParameters)
@@ -151 +133 @@
 
     // This JSActivation function is defined here so it can get at Arguments::setRegisters.
-    inline void JSActivation::copyRegisters(JSValue* arguments)
+    inline void JSActivation::copyRegisters(Arguments* arguments)
     {
         ASSERT(!d()->registerArray);
@@ -167 +149 @@
         Register* registerArray = copyRegisterArray(d()->registers - registerOffset, registerArraySize);
         setRegisters(registerArray + registerOffset, registerArray);
-        if (arguments) {
-            ASSERT(arguments->isObject(&Arguments::info));
+        if (arguments && !arguments->isTornOff())
             static_cast<Arguments*>(arguments)->setRegisters(registerArray + registerOffset);
-        }
     }
 

trunk/JavaScriptCore/kjs/JSActivation.cpp

@@ -156 +156 @@
     JSActivation* thisObj = static_cast<JSActivation*>(slot.slotBase());
 
-    JSValue* arguments;
     if (thisObj->d()->functionBody->usesArguments()) {
         PropertySlot slot;
         thisObj->symbolTableGet(exec->propertyNames().arguments, slot);
-        arguments = slot.getValue(exec, exec->propertyNames().arguments);
-    } else {
-        arguments = thisObj->d()->registers[RegisterFile::OptionalCalleeArguments].getJSValue();
-        if (!arguments) {
-            arguments = new (exec) Arguments(exec, thisObj);
-            thisObj->d()->registers[RegisterFile::OptionalCalleeArguments] = arguments;
-        }
-        ASSERT(arguments->isObject(&Arguments::info));
+        return slot.getValue(exec, exec->propertyNames().arguments);
     }
+
+    Arguments* arguments = static_cast<Arguments*>(thisObj->d()->registers[RegisterFile::OptionalCalleeArguments].getJSValue());
+    if (!arguments) {
+        arguments = new (exec) Arguments(exec, &thisObj->registerAt(0));
+        arguments->copyRegisters();
+        thisObj->d()->registers[RegisterFile::OptionalCalleeArguments] = arguments;
+    }
+    ASSERT(arguments->isObject(&Arguments::info));
 
     return arguments;

trunk/JavaScriptCore/kjs/JSActivation.h

@@ -60 +60 @@
         virtual JSObject* toThisObject(ExecState*) const;
 
-        void copyRegisters(JSValue* arguments);
+        void copyRegisters(Arguments* arguments);
         
         virtual const ClassInfo* classInfo() const { return &info; }