Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 4ffed6dbcfa0 · 2021-12-20T23:53:50.000+03:00
* PHP-8.0:
  JIT: Fix incorrect JIT prologur size for CLANG/x86 build
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -3453,7 +3453,7 @@ static int zend_jit_trace_link_to_root(dasm_State **Dst, zend_jit_trace_info *t,
 #if defined(__x86_64__) || defined(_M_X64)
 		prologue_size = 17;
 #else
-		prologue_size = 12;
+		prologue_size = 13;
 #endif
 	}
 	link_addr = (const void*)((const char*)t->code_start + prologue_size);

Original file line number	Diff line number	Diff line change
`@@ -3453,7 +3453,7 @@ static int zend_jit_trace_link_to_root(dasm_State *Dst, zend_jit_trace_info t,`
`3453`	`3453`	`#if defined(__x86_64__) \|\| defined(_M_X64)`
`3454`	`3454`	`prologue_size = 17;`
`3455`	`3455`	`#else`
`3456`		`- prologue_size = 12;`
	`3456`	`+ prologue_size = 13;`
`3457`	`3457`	`#endif`
`3458`	`3458`	`}`
`3459`	`3459`	`link_addr = (const void)((const char)t->code_start + prologue_size);`