Fix double autoloading issue in debug builds

Author: Girgias

Zend/zend_API.c

@@ -3451,38 +3451,35 @@ ZEND_API void zend_release_fcall_info_cache(zend_fcall_info_cache *fcc) {
 	}
 }
 
-static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_execute_data *frame, zend_fcall_info_cache *fcc, bool strict_class, char **error) /* {{{ */
+static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_execute_data *frame,
+	zend_fcall_info_cache *fcc, bool strict_class, char **error, bool use_autoloader) /* {{{ */
 {
 	zend_class_entry *ce_org = fcc->calling_scope;
 	bool retval = 0;
 	zend_string *mname, *cname;
 	zend_string *lmname;
-	const char *colon;
-	size_t clen;
+	const char *colon = zend_memrchr(Z_STRVAL_P(callable), ':', Z_STRLEN_P(callable));
 	HashTable *ftable;
-	int call_via_handler = 0;
+	bool call_via_handler = 0;
 	zend_class_entry *scope;
 	zval *zv;
 
 	fcc->calling_scope = NULL;
 
-	if (!ce_org) {
-		zend_function *func = zend_fetch_function(Z_STR_P(callable));
+	if (!ce_org && !colon) {
+		zend_function *func = zend_fetch_function_ex(Z_STR_P(callable), use_autoloader);
 		if (EXPECTED(func != NULL)) {
 			fcc->function_handler = func;
 			return 1;
 		}
 	}
 
 	/* Split name into class/namespace and method/function names */
-	if ((colon = zend_memrchr(Z_STRVAL_P(callable), ':', Z_STRLEN_P(callable))) != NULL &&
-		colon > Z_STRVAL_P(callable) &&
-		*(colon-1) == ':'
-	) {
+	if (colon && colon > Z_STRVAL_P(callable) && *(colon-1) == ':') {
 		size_t mlen;
 
 		colon--;
-		clen = colon - Z_STRVAL_P(callable);
+		size_t clen = colon - Z_STRVAL_P(callable);
 		mlen = Z_STRLEN_P(callable) - clen - 2;
 
 		if (colon == Z_STRVAL_P(callable)) {
@@ -3768,7 +3765,7 @@ ZEND_API bool zend_is_callable_at_frame(
 			}
 
 check_func:
-			ret = zend_is_callable_check_func(callable, frame, fcc, strict_class, error);
+			ret = zend_is_callable_check_func(callable, frame, fcc, strict_class, error, (check_flags & IS_CALLABLE_CHECK_NO_AUTOLOAD));
 			if (fcc == &fcc_local) {
 				zend_release_fcall_info_cache(fcc);
 			}

Zend/zend_API.h

@@ -379,6 +379,8 @@ ZEND_API zend_result zend_disable_class(const char *class_name, size_t class_nam
 ZEND_API ZEND_COLD void zend_wrong_param_count(void);
 
 #define IS_CALLABLE_CHECK_SYNTAX_ONLY (1<<0)
+/* Only used for DEBUG builds where the VM will check if a call should throw, causing double autoloading */
+#define IS_CALLABLE_CHECK_NO_AUTOLOAD (2<<0)
 
 ZEND_API void zend_release_fcall_info_cache(zend_fcall_info_cache *fcc);
 ZEND_API zend_string *zend_get_callable_name_ex(zval *callable, zend_object *object);

Zend/zend_execute.c

@@ -1045,7 +1045,7 @@ static zend_always_inline bool zend_check_type_slow(
 	}
 
 	type_mask = ZEND_TYPE_FULL_MASK(*type);
-	if ((type_mask & MAY_BE_CALLABLE) && zend_is_callable(arg, 0, NULL)) {
+	if ((type_mask & MAY_BE_CALLABLE) && zend_is_callable(arg, IS_CALLABLE_CHECK_NO_AUTOLOAD, NULL)) {
 		return 1;
 	}
 	if ((type_mask & MAY_BE_ITERABLE) && zend_is_iterable(arg)) {
@@ -3783,9 +3783,9 @@ static zend_never_inline void ZEND_FASTCALL init_func_run_time_cache(zend_op_arr
 }
 /* }}} */
 
-ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name) /* {{{ */
+ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_ex(zend_string *name, bool use_autoloader) /* {{{ */
 {
-	zend_function *fbc = zend_lookup_function(name);
+	zend_function *fbc = zend_lookup_function_ex(name, NULL, use_autoloader);
 
 	if (UNEXPECTED(fbc == NULL)) {
 		return NULL;

Zend/zend_execute.h

@@ -355,7 +355,10 @@ ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_t
 ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, int fetch_type, zend_class_entry *scope);
 ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, int fetch_type);
 
-ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name);
+ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_ex(zend_string *name, bool use_autoload);
+static inline zend_function * zend_fetch_function(zend_string *name) {
+	return zend_fetch_function_ex(name, true);
+}
 ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name, size_t len);
 ZEND_API void ZEND_FASTCALL zend_init_func_run_time_cache(zend_op_array *op_array);