Bad function detection

dstogov · dstogov · commit 9d14bdb37717 · 2020-07-09T17:24:35.000+03:00
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -475,7 +475,7 @@ static int zend_jit_trace_record_fake_init_call_ex(zend_execute_data *call, zend
 		}
 
 		func = call->func;
-		if (func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
+		if (func->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)) {
 			/* TODO: Can we continue recording ??? */
 			return -1;
 		}
@@ -855,6 +855,10 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 					/* TODO: Can we continue recording ??? */
 					stop = ZEND_JIT_TRACE_STOP_TRAMPOLINE;
 					break;
+				} else if (EX(call)->func->common.fn_flags & ZEND_ACC_NEVER_CACHE) {
+					/* TODO: Can we continue recording ??? */
+					stop = ZEND_JIT_TRACE_STOP_BAD_FUNC;
+					break;
 				}
 				func = EX(call)->func;
 				if (func->type == ZEND_USER_FUNCTION

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ static int zend_jit_trace_record_fake_init_call_ex(zend_execute_data *call, zend`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`func = call->func;`
`478`		`- if (func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {`
	`478`	`+ if (func->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE\|ZEND_ACC_NEVER_CACHE)) {`
`479`	`479`	`/* TODO: Can we continue recording ??? */`
`480`	`480`	`return -1;`
`481`	`481`	`}`
`@@ -855,6 +855,10 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,`
`855`	`855`	`/* TODO: Can we continue recording ??? */`
`856`	`856`	`stop = ZEND_JIT_TRACE_STOP_TRAMPOLINE;`
`857`	`857`	`break;`
	`858`	`+ } else if (EX(call)->func->common.fn_flags & ZEND_ACC_NEVER_CACHE) {`
	`859`	`+ /* TODO: Can we continue recording ??? */`
	`860`	`+ stop = ZEND_JIT_TRACE_STOP_BAD_FUNC;`
	`861`	`+ break;`
`858`	`862`	`}`
`859`	`863`	`func = EX(call)->func;`
`860`	`864`	`if (func->type == ZEND_USER_FUNCTION`