Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 94eb3bdcbf34 · 2023-09-08T18:27:44.000+03:00
* PHP-8.2: Fixed tracing JIT support for CALLABLE_CONVERT (#12156)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -1065,6 +1065,7 @@ static const zend_op *zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec *p, c
 					case ZEND_DO_ICALL:
 					case ZEND_DO_UCALL:
 					case ZEND_DO_FCALL_BY_NAME:
+					case ZEND_CALLABLE_CONVERT:
 						call_level++;
 						break;
 				}
@@ -6206,6 +6207,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 				case ZEND_DO_ICALL:
 				case ZEND_DO_UCALL:
 				case ZEND_DO_FCALL_BY_NAME:
+				case ZEND_CALLABLE_CONVERT:
 					frame->call_level--;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1065,6 +1065,7 @@ static const zend_op zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec p, c`
`1065`	`1065`	`case ZEND_DO_ICALL:`
`1066`	`1066`	`case ZEND_DO_UCALL:`
`1067`	`1067`	`case ZEND_DO_FCALL_BY_NAME:`
	`1068`	`+ case ZEND_CALLABLE_CONVERT:`
`1068`	`1069`	`call_level++;`
`1069`	`1070`	`break;`
`1070`	`1071`	`}`
`@@ -6206,6 +6207,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6206`	`6207`	`case ZEND_DO_ICALL:`
`6207`	`6208`	`case ZEND_DO_UCALL:`
`6208`	`6209`	`case ZEND_DO_FCALL_BY_NAME:`
	`6210`	`+ case ZEND_CALLABLE_CONVERT:`
`6209`	`6211`	`frame->call_level--;`
`6210`	`6212`	`}`
`6211`	`6213`