Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 8fcffa666fb8 · 2023-09-08T18:27:31.000+03:00
* PHP-8.1: Fixed tracing JIT support for CALLABLE_CONVERT (php#12156)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -1062,6 +1062,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;
 				}
@@ -6202,6 +6203,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
`@@ -1062,6 +1062,7 @@ static const zend_op zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec p, c`
`1062`	`1062`	`case ZEND_DO_ICALL:`
`1063`	`1063`	`case ZEND_DO_UCALL:`
`1064`	`1064`	`case ZEND_DO_FCALL_BY_NAME:`
	`1065`	`+ case ZEND_CALLABLE_CONVERT:`
`1065`	`1066`	`call_level++;`
`1066`	`1067`	`break;`
`1067`	`1068`	`}`
`@@ -6202,6 +6203,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6202`	`6203`	`case ZEND_DO_ICALL:`
`6203`	`6204`	`case ZEND_DO_UCALL:`
`6204`	`6205`	`case ZEND_DO_FCALL_BY_NAME:`
	`6206`	`+ case ZEND_CALLABLE_CONVERT:`
`6205`	`6207`	`frame->call_level--;`
`6206`	`6208`	`}`
`6207`	`6209`