Commit 061b46e

realFlowControlarnaud-lb

authored and

committed

Save opline in zend_jit_hot_func()

1 parent bd9f03a commit 061b46eCopy full SHA for 061b46e

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ PHP NEWS`
`33`	`33`
`34`	`34`	`- Opcache:`
`35`	`35`	`. Fixed bug GH-18294 (assertion failure zend_jit_ir.c). (nielsdos)`
	`36`	`+ . Fixed bug GH-18289 (Fix segfault in JIT). (Florian Engelhardt)`
`36`	`37`
`37`	`38`	`- OpenSSL:`
`38`	`39`	`. Fix memory leak in openssl_sign() when passing invalid algorithm.`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3033,6 +3033,10 @@ void ZEND_FASTCALL zend_jit_hot_func(zend_execute_data *execute_data, const zend`
`3033`	`3033`	`op_array->opcodes[i].handler = jit_extension->orig_handlers[i];`
`3034`	`3034`	`}`
`3035`	`3035`
	`3036`	`+#ifdef HAVE_GCC_GLOBAL_REGS`
	`3037`	`+ EX(opline) = opline;`
	`3038`	`+#endif`
	`3039`	`+`
`3036`	`3040`	`/* perform real JIT for this function */`
`3037`	`3041`	`zend_real_jit_func(op_array, NULL, opline, ZEND_JIT_ON_HOT_COUNTERS);`
`3038`	`3042`	`} zend_catch {`

Comments

(0)