Changeset 209678 in webkit for trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp

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/ftl/FTLOSREntry.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp

@@ -72 +72 @@
         dataLog("    Values at entry: ", values, "\n");
     
-    for (unsigned argument = values.numberOfArguments(); argument--;) {
-#if NUMBER_OF_JS_FUNCTION_ARGUMENT_REGISTERS
-        if (argument < NUMBER_OF_JS_FUNCTION_ARGUMENT_REGISTERS)
-            break;
-#endif
+    for (int argument = values.numberOfArguments(); argument--;) {
         JSValue valueOnStack = exec->r(virtualRegisterForArgument(argument).offset()).asanUnsafeJSValue();
         JSValue reconstructedValue = values.argument(argument);
@@ -104 +100 @@
     
     exec->setCodeBlock(entryCodeBlock);
-
-#if NUMBER_OF_JS_FUNCTION_ARGUMENT_REGISTERS
-    void* result = entryCode->addressForCall(RegisterArgsArityCheckNotRequired).executableAddress();
-#else
-    void* result = entryCode->addressForCall(StackArgsArityCheckNotRequired).executableAddress();
-#endif
+    
+    void* result = entryCode->addressForCall(ArityCheckNotRequired).executableAddress();
     if (Options::verboseOSR())
         dataLog("    Entry will succeed, going to address", RawPointer(result), "\n");