Title: [293153] releases/WebKitGTK/webkit-2.36
Revision
293153
Author
carlo...@webkit.org
Date
2022-04-21 02:51:14 -0700 (Thu, 21 Apr 2022)

Log Message

Merge r291785 - [JSC] Fix remoteFunctionCallGenerator on MIPS
https://bugs.webkit.org/show_bug.cgi?id=238274

Patch by Geza Lore <gl...@igalia.com> on 2022-03-23
Reviewed by Yusuke Suzuki.

JSTests:

* stress/shadow-realm-evaluate.js:

Source/_javascript_Core:

Eliminate register conflict (nonArgGPR0 == regT4, which is used in
valueRegs)

* jit/ThunkGenerators.cpp:
(JSC::remoteFunctionCallGenerator):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.36/JSTests/ChangeLog (293152 => 293153)


--- releases/WebKitGTK/webkit-2.36/JSTests/ChangeLog	2022-04-21 09:51:10 UTC (rev 293152)
+++ releases/WebKitGTK/webkit-2.36/JSTests/ChangeLog	2022-04-21 09:51:14 UTC (rev 293153)
@@ -1,3 +1,12 @@
+2022-03-23  Geza Lore  <gl...@igalia.com>
+
+        [JSC] Fix remoteFunctionCallGenerator on MIPS
+        https://bugs.webkit.org/show_bug.cgi?id=238274
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/shadow-realm-evaluate.js:
+
 2022-02-21  Yusuke Suzuki  <ysuz...@apple.com>
 
         [JSC] Fix ShadowRealm unwinding

Modified: releases/WebKitGTK/webkit-2.36/JSTests/stress/shadow-realm-evaluate.js (293152 => 293153)


--- releases/WebKitGTK/webkit-2.36/JSTests/stress/shadow-realm-evaluate.js	2022-04-21 09:51:10 UTC (rev 293152)
+++ releases/WebKitGTK/webkit-2.36/JSTests/stress/shadow-realm-evaluate.js	2022-04-21 09:51:14 UTC (rev 293153)
@@ -1,4 +1,3 @@
-//@ skip if "mips" == $architecture
 //@ requireOptions("--useShadowRealm=1")
 
 function shouldBe(actual, expected) {

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog (293152 => 293153)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog	2022-04-21 09:51:10 UTC (rev 293152)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog	2022-04-21 09:51:14 UTC (rev 293153)
@@ -1,3 +1,16 @@
+2022-03-23  Geza Lore  <gl...@igalia.com>
+
+        [JSC] Fix remoteFunctionCallGenerator on MIPS
+        https://bugs.webkit.org/show_bug.cgi?id=238274
+
+        Reviewed by Yusuke Suzuki.
+
+        Eliminate register conflict (nonArgGPR0 == regT4, which is used in
+        valueRegs)
+
+        * jit/ThunkGenerators.cpp:
+        (JSC::remoteFunctionCallGenerator):
+
 2022-03-03  Saam Barati  <sbar...@apple.com>
 
         Add a DeferTraps scope

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/jit/ThunkGenerators.cpp (293152 => 293153)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/jit/ThunkGenerators.cpp	2022-04-21 09:51:10 UTC (rev 293152)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/jit/ThunkGenerators.cpp	2022-04-21 09:51:14 UTC (rev 293153)
@@ -1527,11 +1527,10 @@
 
         jit.storePtr(GPRInfo::regT1, jit.addressFor(loopIndex));
 
+        jit.prepareCallOperation(vm);
+        jit.setupArguments<decltype(operationGetWrappedValueForTarget)>(GPRInfo::regT0, valueRegs);
         jit.move(CCallHelpers::TrustedImmPtr(tagCFunction<OperationPtrTag>(operationGetWrappedValueForTarget)), GPRInfo::nonArgGPR0);
         emitPointerValidation(jit, GPRInfo::nonArgGPR0, OperationPtrTag);
-
-        jit.setupArguments<decltype(operationGetWrappedValueForTarget)>(GPRInfo::regT0, valueRegs);
-        jit.prepareCallOperation(vm);
         jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
         exceptionChecks.append(jit.emitJumpIfException(vm));
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to