Title: [290432] releases/WebKitGTK/webkit-2.36/Source/_javascript_Core
Revision
290432
Author
ape...@igalia.com
Date
2022-02-24 08:09:32 -0800 (Thu, 24 Feb 2022)

Log Message

Merge r290359 - Ensure generated inline assembler that setups segments returns to previous state
https://bugs.webkit.org/show_bug.cgi?id=236976

Reviewed by Yusuke Suzuki.

Use .previous in inline assembler in order to ensure that mixed emission of assembler
functions and other definitions correctly puts each of them in their rightful sections
in the output object code.

* assembler/MacroAssemblerARM64.cpp:
* assembler/MacroAssemblerARMv7.cpp:
* assembler/MacroAssemblerMIPS.cpp:
* assembler/MacroAssemblerX86Common.cpp:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog (290431 => 290432)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog	2022-02-24 16:08:45 UTC (rev 290431)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog	2022-02-24 16:09:32 UTC (rev 290432)
@@ -1,3 +1,19 @@
+2022-02-23  Adrian Perez de Castro  <ape...@igalia.com>
+
+        Ensure generated inline assembler that setups segments returns to previous state
+        https://bugs.webkit.org/show_bug.cgi?id=236976
+
+        Reviewed by Yusuke Suzuki.
+
+        Use .previous in inline assembler in order to ensure that mixed emission of assembler
+        functions and other definitions correctly puts each of them in their rightful sections
+        in the output object code.
+
+        * assembler/MacroAssemblerARM64.cpp:
+        * assembler/MacroAssemblerARMv7.cpp:
+        * assembler/MacroAssemblerMIPS.cpp:
+        * assembler/MacroAssemblerX86Common.cpp:
+
 2022-02-22  Alexander Kanavin  <a...@linutronix.de>
 
         When building introspection files, add CMAKE_C_FLAGS to the compiler flags.

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp (290431 => 290432)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp	2022-02-24 16:08:45 UTC (rev 290431)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp	2022-02-24 16:09:32 UTC (rev 290432)
@@ -572,6 +572,7 @@
 #else
     "ret" "\n"
 #endif
+    ".previous" "\n"
 );
 #endif // COMPILER(GCC_COMPATIBLE)
 

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp (290431 => 290432)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp	2022-02-24 16:08:45 UTC (rev 290431)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp	2022-02-24 16:09:32 UTC (rev 290432)
@@ -361,6 +361,7 @@
     // Restore the sp and pc.
     "ldr       sp, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_SP_OFFSET) "]" "\n"
     "pop       { pc }" "\n"
+    ".previous" "\n"
 );
 #endif // COMPILER(GCC_COMPATIBLE)
 

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerMIPS.cpp (290431 => 290432)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerMIPS.cpp	2022-02-24 16:08:45 UTC (rev 290431)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerMIPS.cpp	2022-02-24 16:09:32 UTC (rev 290432)
@@ -549,6 +549,7 @@
     "jr        $ra" "\n"
     "nop" "\n"
     ".set pop" "\n"
+    ".previous" "\n"
 );
 #endif // COMPILER(GCC_COMPATIBLE)
 

Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp (290431 => 290432)


--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp	2022-02-24 16:08:45 UTC (rev 290431)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp	2022-02-24 16:09:32 UTC (rev 290432)
@@ -341,6 +341,7 @@
     "popl %ecx" "\n"
     "popl %ebp" "\n"
     "ret" "\n"
+    ".previous" "\n"
 );
 #endif
 
@@ -709,6 +710,7 @@
     "popq %rcx" "\n"
     "popq %rbp" "\n"
     "ret" "\n"
+    ".previous" "\n"
 );
 #endif // COMPILER(GCC_COMPATIBLE)
 #endif // CPU(X86_64)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to