Changeset 100224 in webkit for trunk/Source/JavaScriptCore/runtime/Arguments.h

Timestamp:

Nov 14, 2011, 5:39:52 PM (14 years ago)

Author:

[email protected]

Message:

A little bit of arguments / activation cleanup
​https://bugs.webkit.org/show_bug.cgi?id=72339

Reviewed by Gavin Barraclough.

Renamed copyRegisters => tearOff to match bytecode and other terminology.

Renamed setActivation => didTearOffActivation to indicate that this is a
notification the object may choose to ignore. Moved "Should I ignore?"
code into the arguments object to avoid duplication elsewhere.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::unwindCallFrame):
(JSC::Interpreter::privateExecute):
(JSC::Interpreter::retrieveArguments):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/Arguments.h:

(JSC::Arguments::createAndTearOff):
(JSC::Arguments::didTearOffActivation):
(JSC::Arguments::finishCreationButDontTearOff):
(JSC::Arguments::finishCreation):
(JSC::Arguments::finishCreationAndTearOff):
(JSC::Arguments::tearOff):

• runtime/JSActivation.h:

(JSC::JSActivation::tearOff): Moved Activation's code into its own header
because that's where it belongs.

File:

• trunk/Source/JavaScriptCore/runtime/Arguments.h (modified) (7 diffs)

trunk/Source/JavaScriptCore/runtime/Arguments.h

@@ -71 +71 @@
         }
         
-        static Arguments* createAndCopyRegisters(JSGlobalData& globalData, CallFrame* callFrame)
+        static Arguments* createAndTearOff(JSGlobalData& globalData, CallFrame* callFrame)
         {
             Arguments* arguments = new (allocateCell<Arguments>(globalData.heap)) Arguments(callFrame);
-            arguments->finishCreationAndCopyRegisters(callFrame);
+            arguments->finishCreationAndTearOff(callFrame);
             return arguments;
         }
@@ -112 +112 @@
         
         void copyToRegisters(ExecState* exec, Register* buffer, uint32_t maxSize);
-        void copyRegisters(JSGlobalData&);
+        void tearOff(JSGlobalData&);
         bool isTornOff() const { return d->registerArray; }
-        void setActivation(JSGlobalData& globalData, JSActivation* activation)
-        {
-            ASSERT(!d->registerArray);
+        void didTearOffActivation(JSGlobalData& globalData, JSActivation* activation)
+        {
+            if (isTornOff())
+                return;
             d->activation.set(globalData, this, activation);
             d->registers = &activation->registerAt(0);
@@ -129 +130 @@
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | JSObject::StructureFlags;
 
-        void finishCreationButDontCopyRegisters(CallFrame*);
+        void finishCreationButDontTearOff(CallFrame*);
         void finishCreation(CallFrame*);
-        void finishCreationAndCopyRegisters(CallFrame*);
+        void finishCreationAndTearOff(CallFrame*);
         void finishCreation(CallFrame*, NoParametersType);
 
@@ -191 +192 @@
     }
     
-    inline void Arguments::finishCreationButDontCopyRegisters(CallFrame* callFrame)
+    inline void Arguments::finishCreationButDontTearOff(CallFrame* callFrame)
     {
         Base::finishCreation(callFrame->globalData());
@@ -234 +235 @@
     {
         ASSERT(!callFrame->isInlineCallFrame());
-        finishCreationButDontCopyRegisters(callFrame);
+        finishCreationButDontTearOff(callFrame);
         if (d->isStrictMode)
-            copyRegisters(callFrame->globalData());
-    }
-
-    inline void Arguments::finishCreationAndCopyRegisters(CallFrame* callFrame)
+            tearOff(callFrame->globalData());
+    }
+
+    inline void Arguments::finishCreationAndTearOff(CallFrame* callFrame)
     {
         Base::finishCreation(callFrame->globalData());
@@ -357 +358 @@
         d->isStrictMode = callFrame->codeBlock()->isStrictMode();
         if (d->isStrictMode)
-            copyRegisters(callFrame->globalData());
-    }
-
-    inline void Arguments::copyRegisters(JSGlobalData& globalData)
+            tearOff(callFrame->globalData());
+    }
+
+    inline void Arguments::tearOff(JSGlobalData& globalData)
     {
         ASSERT(!isTornOff());
@@ -377 +378 @@
     }
 
-    // This JSActivation function is defined here so it can get at Arguments::setRegisters.
-    inline void JSActivation::copyRegisters(JSGlobalData& globalData)
-    {
-        ASSERT(!m_registerArray);
-
-        size_t numLocals = m_numCapturedVars + m_numParametersMinusThis;
-
-        if (!numLocals)
-            return;
-
-        int registerOffset = m_numParametersMinusThis + RegisterFile::CallFrameHeaderSize;
-        size_t registerArraySize = numLocals + RegisterFile::CallFrameHeaderSize;
-
-        OwnArrayPtr<WriteBarrier<Unknown> > registerArray = copyRegisterArray(globalData, m_registers - registerOffset, registerArraySize, m_numParametersMinusThis + 1);
-        WriteBarrier<Unknown>* registers = registerArray.get() + registerOffset;
-        setRegisters(registers, registerArray.release());
-    }
-
 } // namespace JSC