Load ptoper IP value

dstogov · dstogov · commit 9e80558047eb · 2020-07-29T17:37:01.000+03:00
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -9097,6 +9097,10 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 
 		if ((!trace || !func) && opline->opcode != ZEND_DO_ICALL) {
 			|	LOAD_IP_ADDR (opline + 1)
+		} else if (trace
+		 && trace->op == ZEND_JIT_TRACE_END
+		 && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER) {
+			|	LOAD_IP_ADDR (opline + 1)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -9097,6 +9097,10 @@ static int zend_jit_do_fcall(dasm_State *Dst, const zend_op opline, const zend`
`9097`	`9097`
`9098`	`9098`	`if ((!trace \|\| !func) && opline->opcode != ZEND_DO_ICALL) {`
`9099`	`9099`	`\| LOAD_IP_ADDR (opline + 1)`
	`9100`	`+ } else if (trace`
	`9101`	`+ && trace->op == ZEND_JIT_TRACE_END`
	`9102`	`+ && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER) {`
	`9103`	`+ \| LOAD_IP_ADDR (opline + 1)`
`9100`	`9104`	`}`
`9101`	`9105`	`}`
`9102`	`9106`