Changeset 209678 in webkit for trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h

Timestamp:

Dec 10, 2016, 5:14:37 PM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r209653, r209654, r209663, and
r209673.
​https://bugs.webkit.org/show_bug.cgi?id=165739

speedometer crashes (Requested by pizlo on #webkit).

Reverted changesets:

"JSVALUE64: Pass arguments in platform argument registers when
making JavaScript calls"
​https://bugs.webkit.org/show_bug.cgi?id=160355
​http://trac.webkit.org/changeset/209653

"Unreviewed build fix for 32 bit builds."
​http://trac.webkit.org/changeset/209654

"Unreviewed build fix for the CLOOP after r209653"
​http://trac.webkit.org/changeset/209663

"REGRESSION(r209653) Crash in CallFrameShuffler::snapshot()"
​https://bugs.webkit.org/show_bug.cgi?id=165728
​http://trac.webkit.org/changeset/209673

File:

• trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h (modified) (8 diffs)

trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h

@@ -29 +29 @@
 
 #include "JIT.h"
-#include "JITEntryPoints.h"
 #include "JITInlines.h"
 #include "JSInterfaceJIT.h"
@@ -39 +38 @@
     public:
         static const int ThisArgument = -1;
-        enum ArgLocation { OnStack, InRegisters };
-
-        SpecializedThunkJIT(VM* vm, int expectedArgCount, AssemblyHelpers::SpillRegisterType spillType = AssemblyHelpers::SpillExactly, ArgLocation argLocation = OnStack)
+        SpecializedThunkJIT(VM* vm, int expectedArgCount)
             : JSInterfaceJIT(vm)
         {
-#if !NUMBER_OF_JS_FUNCTION_ARGUMENT_REGISTERS
-            UNUSED_PARAM(spillType);
-            UNUSED_PARAM(argLocation);
-#else
-            if (argLocation == InRegisters) {
-                m_stackArgumentsEntry = label();
-                fillArgumentRegistersFromFrameBeforePrologue();
-                m_registerArgumentsEntry = label();
-                emitFunctionPrologue();
-                emitSaveThenMaterializeTagRegisters();
-                // Check that we have the expected number of arguments
-                m_failures.append(branch32(NotEqual, argumentRegisterForArgumentCount(), TrustedImm32(expectedArgCount + 1)));
-            } else {
-                spillArgumentRegistersToFrameBeforePrologue(expectedArgCount + 1, spillType);
-                m_stackArgumentsEntry = label();
-#endif
-                emitFunctionPrologue();
-                emitSaveThenMaterializeTagRegisters();
-                // Check that we have the expected number of arguments
-                m_failures.append(branch32(NotEqual, payloadFor(CallFrameSlot::argumentCount), TrustedImm32(expectedArgCount + 1)));
-#if NUMBER_OF_JS_FUNCTION_ARGUMENT_REGISTERS
-                }
-#endif
+            emitFunctionPrologue();
+            emitSaveThenMaterializeTagRegisters();
+            // Check that we have the expected number of arguments
+            m_failures.append(branch32(NotEqual, payloadFor(CallFrameSlot::argumentCount), TrustedImm32(expectedArgCount + 1)));
         }
         
@@ -72 +50 @@
             : JSInterfaceJIT(vm)
         {
-#if USE(JSVALUE64)
-            spillArgumentRegistersToFrameBeforePrologue();
-            m_stackArgumentsEntry = Label();
-#endif
             emitFunctionPrologue();
             emitSaveThenMaterializeTagRegisters();
@@ -121 +95 @@
             m_failures.append(conversionFailed);
         }
-
-        void checkJSStringArgument(VM& vm, RegisterID argument)
-        {
-            m_failures.append(emitJumpIfNotJSCell(argument));
-            m_failures.append(branchStructure(NotEqual,
-                Address(argument, JSCell::structureIDOffset()),
-                vm.stringStructure.get()));
-        }
         
         void appendFailure(const Jump& failure)
@@ -134 +100 @@
             m_failures.append(failure);
         }
-
-        void linkFailureHere()
-        {
-            m_failures.link(this);
-            m_failures.clear();
-        }
-
 #if USE(JSVALUE64)
         void returnJSValue(RegisterID src)
@@ -206 +165 @@
         }
         
-        JITEntryPointsWithRef finalize(MacroAssemblerCodePtr fallback, const char* thunkKind)
+        MacroAssemblerCodeRef finalize(MacroAssemblerCodePtr fallback, const char* thunkKind)
         {
             LinkBuffer patchBuffer(*m_vm, *this, GLOBAL_THUNK_ID);
@@ -212 +171 @@
             for (unsigned i = 0; i < m_calls.size(); i++)
                 patchBuffer.link(m_calls[i].first, m_calls[i].second);
-
-            MacroAssemblerCodePtr stackEntry;
-            if (m_stackArgumentsEntry.isSet())
-                stackEntry = patchBuffer.locationOf(m_stackArgumentsEntry);
-            MacroAssemblerCodePtr registerEntry;
-            if (m_registerArgumentsEntry.isSet())
-                registerEntry = patchBuffer.locationOf(m_registerArgumentsEntry);
-
-            MacroAssemblerCodeRef entry = FINALIZE_CODE(patchBuffer, ("Specialized thunk for %s", thunkKind));
-
-            if (m_stackArgumentsEntry.isSet()) {
-                if (m_registerArgumentsEntry.isSet())
-                    return JITEntryPointsWithRef(entry, registerEntry, registerEntry, registerEntry, stackEntry, stackEntry);
-                return JITEntryPointsWithRef(entry, entry.code(), entry.code(), entry.code(), stackEntry, stackEntry);
-            }
-
-            return JITEntryPointsWithRef(entry, entry.code(), entry.code());
+            return FINALIZE_CODE(patchBuffer, ("Specialized thunk for %s", thunkKind));
         }
 
@@ -265 +208 @@
         
         MacroAssembler::JumpList m_failures;
-        MacroAssembler::Label m_registerArgumentsEntry;
-        MacroAssembler::Label m_stackArgumentsEntry;
         Vector<std::pair<Call, FunctionPtr>> m_calls;
     };