Commit 6d1fbd2

committed

Always use return address

1 parent 98bacde commit 6d1fbd2Copy full SHA for 6d1fbd2

File tree

+18

-18

lines changed

+18

-18

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -10936,7 +10936,15 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`10936`	`10936`	`}`
`10937`	`10937`
`10938`	`10938`	`if (return_value_used == 0) {`
`10939`		`- /* pass */`
	`10939`	`+ if (ZEND_OBSERVER_ENABLED && Z_MODE(op1_addr) == IS_REG) {`
	`10940`	`+ zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);`
	`10941`	`+`
	`10942`	`+ if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {`
	`10943`	`+ return 0;`
	`10944`	`+ }`
	`10945`	`+ op1_addr = dst;`
	`10946`	`+ }`
	`10947`	`+ ret_addr = op1_addr;`
`10940`	`10948`	`} else if (opline->op1_type == IS_CONST) {`
`10941`	`10949`	`zval *zv = RT_CONSTANT(opline, opline->op1);`
`10942`	`10950`	`\| ZVAL_COPY_CONST ret_addr, MAY_BE_ANY, MAY_BE_ANY, zv, ZREG_REG0, ZREG_TMP1, ZREG_FPR0`
`@@ -11005,14 +11013,6 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`11005`	`11013`
`11006`	`11014`	`\|9:`
`11007`	`11015`	`if (ZEND_OBSERVER_ENABLED) {`
`11008`		`- if (Z_MODE(op1_addr) == IS_REG) {`
`11009`		`- zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);`
`11010`		`-`
`11011`		`- if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {`
`11012`		`- return 0;`
`11013`		`- }`
`11014`		`- op1_addr = dst;`
`11015`		`- }`
`11016`	`11016`	`\| LOAD_ZVAL_ADDR FCARG2x, op1_addr`
`11017`	`11017`	`\| mov FCARG1x, FP`
`11018`	`11018`	`\| SET_EX_OPLINE opline, REG0`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -11649,7 +11649,15 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`11649`	`11649`	`}`
`11650`	`11650`
`11651`	`11651`	`if (return_value_used == 0) {`
`11652`		`- /* pass */`
	`11652`	`+ if (ZEND_OBSERVER_ENABLED && Z_MODE(op1_addr) == IS_REG) {`
	`11653`	`+ zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);`
	`11654`	`+`
	`11655`	`+ if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {`
	`11656`	`+ return 0;`
	`11657`	`+ }`
	`11658`	`+ op1_addr = dst;`
	`11659`	`+ }`
	`11660`	`+ ret_addr = op1_addr;`
`11653`	`11661`	`} else if (opline->op1_type == IS_CONST) {`
`11654`	`11662`	`zval *zv = RT_CONSTANT(opline, opline->op1);`
`11655`	`11663`	`\| ZVAL_COPY_CONST ret_addr, MAY_BE_ANY, MAY_BE_ANY, zv, ZREG_R0`
`@@ -11717,14 +11725,6 @@ static int zend_jit_return(dasm_State *Dst, const zend_op opline, const zend_o`
`11717`	`11725`
`11718`	`11726`	`\|9:`
`11719`	`11727`	`if (ZEND_OBSERVER_ENABLED) {`
`11720`		`- if (Z_MODE(op1_addr) == IS_REG) {`
`11721`		`- zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);`
`11722`		`-`
`11723`		`- if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {`
`11724`		`- return 0;`
`11725`		`- }`
`11726`		`- op1_addr = dst;`
`11727`		`- }`
`11728`	`11728`	`\| LOAD_ZVAL_ADDR FCARG2a, op1_addr`
`11729`	`11729`	`\| mov FCARG1a, FP`
`11730`	`11730`	`\| SET_EX_OPLINE opline, r0`

Comments

(0)