Fixed incorrect abstract stack size calculation

dstogov · dstogov · commit fbb18e4409b6 · 2020-07-27T21:11:07.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -1019,7 +1019,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 			}
 		} else if (p->op == ZEND_JIT_TRACE_BACK) {
 			if (level == 0) {
-				stack_bottom += zend_jit_trace_frame_size(op_array);
+				stack_bottom += zend_jit_trace_frame_size(p->op_array);
 				jit_extension =
 					(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
 				ssa = &jit_extension->func_info.ssa;

Original file line number	Diff line number	Diff line change
`@@ -1019,7 +1019,7 @@ static zend_ssa zend_jit_trace_build_tssa(zend_jit_trace_rec trace_buffer, uin`
`1019`	`1019`	`}`
`1020`	`1020`	`} else if (p->op == ZEND_JIT_TRACE_BACK) {`
`1021`	`1021`	`if (level == 0) {`
`1022`		`- stack_bottom += zend_jit_trace_frame_size(op_array);`
	`1022`	`+ stack_bottom += zend_jit_trace_frame_size(p->op_array);`
`1023`	`1023`	`jit_extension =`
`1024`	`1024`	`(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);`
`1025`	`1025`	`ssa = &jit_extension->func_info.ssa;`