Commit 7b3b362

committed

Non-JIT passes a pointer to a temp zval into zend_observer_fcall_end

Add internal variables to test output check

1 parent c8201ed commit 7b3b362Copy full SHA for 7b3b362

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10942,6 +10942,7 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`10942`	`10942`	`if (Z_REFCOUNTED_P(zv)) {`
`10943`	`10943`	`\| ADDREF_CONST zv, REG0, TMP1`
`10944`	`10944`	`}`
	`10945`	`+ op1_addr = ret_addr;`
`10945`	`10946`	`} else if (opline->op1_type == IS_TMP_VAR) {`
`10946`	`10947`	`\| ZVAL_COPY_VALUE ret_addr, MAY_BE_ANY, op1_addr, op1_info, ZREG_REG0, ZREG_REG2, ZREG_TMP1, ZREG_TMP2, ZREG_FPR0`
`10947`	`10948`	`} else if (opline->op1_type == IS_CV) {`
`@@ -11001,7 +11002,6 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`11001`	`11002`	`\| ZVAL_COPY_VALUE ret_addr, MAY_BE_ANY, op1_addr, op1_info, ZREG_REG0, ZREG_REG2, ZREG_TMP1, ZREG_TMP2, ZREG_FPR0`
`11002`	`11003`	`}`
`11003`	`11004`	`}`
`11004`		`-`
`11005`	`11005`	`\|9:`
`11006`	`11006`	`if (ZEND_OBSERVER_ENABLED) {`
`11007`	`11007`	`if (Z_MODE(op1_addr) == IS_REG) {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11655,6 +11655,7 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`11655`	`11655`	`if (Z_REFCOUNTED_P(zv)) {`
`11656`	`11656`	`\| ADDREF_CONST zv, r0`
`11657`	`11657`	`}`
	`11658`	`+ op1_addr = ret_addr;`
`11658`	`11659`	`} else if (opline->op1_type == IS_TMP_VAR) {`
`11659`	`11660`	`\| ZVAL_COPY_VALUE ret_addr, MAY_BE_ANY, op1_addr, op1_info, ZREG_R0, ZREG_R2`
`11660`	`11661`	`} else if (opline->op1_type == IS_CV) {`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function hook(): string {`
`19`	`19`	`return 'hook value';`
`20`	`20`	`}`
`21`	`21`
`22`		`-$res = foo('some value');// Retval used`
	`22`	`+$res = foo('some value');`
`23`	`23`	`var_dump($res);`
`24`	`24`	`echo 'Done' . PHP_EOL;`
`25`	`25`	`?>`
`@@ -28,6 +28,7 @@ echo 'Done' . PHP_EOL;`
`28`	`28`	`<!-- init foo() -->`
`29`	`29`	`<foo>`
`30`	`30`	`<!-- init hook() -->`
`31`		`-</foo:'original return value'>`
	`31`	`+</foo:'hook value'>`
	`32`	`+<!-- init var_dump() -->`
`32`	`33`	`string(10) "hook value"`
`33`	`34`	`Done`

Comments

(0)