Disable stack reuse optimization for x86 PIC code. It may clobber local variable used for Global Offset Table.

dstogov · dstogov · commit 8ad2b59e1288 · 2020-12-01T15:20:06.000+03:00
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
@@ -2598,7 +2598,7 @@ function gen_vm($def, $skel) {
     }
     fputs($f, "\n");
     fputs($f, "#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) && !defined(__SANITIZE_ADDRESS__)\n");
-    fputs($f, "# if (defined(i386) || defined(__x86_64__) || defined(_M_X64))\n");
+    fputs($f, "# if ((defined(i386) && !defined(__PIC__)) || defined(__x86_64__) || defined(_M_X64))\n");
     fputs($f, "#  define ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE 16\n");
     fputs($f, "# endif\n");
     fputs($f, "#endif\n");
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
@@ -35,7 +35,7 @@
 #endif
 
 #if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) && !defined(__SANITIZE_ADDRESS__)
-# if (defined(i386) || defined(__x86_64__) || defined(_M_X64))
+# if ((defined(i386) && !defined(__PIC__)) || defined(__x86_64__) || defined(_M_X64))
 #  define ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE 16
 # endif
 #endif

Original file line number	Diff line number	Diff line change
`@@ -2598,7 +2598,7 @@ function gen_vm($def, $skel) {`
`2598`	`2598`	`}`
`2599`	`2599`	`fputs($f, "\n");`
`2600`	`2600`	`fputs($f, "#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) && !defined(__SANITIZE_ADDRESS__)\n");`
`2601`		`- fputs($f, "# if (defined(i386) \|\| defined(__x86_64__) \|\| defined(_M_X64))\n");`
	`2601`	`+ fputs($f, "# if ((defined(i386) && !defined(__PIC__)) \|\| defined(__x86_64__) \|\| defined(_M_X64))\n");`
`2602`	`2602`	`fputs($f, "# define ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE 16\n");`
`2603`	`2603`	`fputs($f, "# endif\n");`
`2604`	`2604`	`fputs($f, "#endif\n");`