Frameless fallback for buildins

Author: iluuu1994

Zend/zend_builtin_functions.c

@@ -1050,6 +1050,21 @@ ZEND_FRAMELESS_FUNCTION(class_exists, 1)
 	Z_FLF_PARAM_FREE_STR(1, name_tmp);
 }
 
+ZEND_FRAMELESS_FUNCTION(class_exists, 2)
+{
+	zval name_tmp;
+	zend_string *name;
+	bool autoload;
+
+	Z_FLF_PARAM_STR(1, name, name_tmp);
+	Z_FLF_PARAM_BOOL(2, autoload);
+
+	_class_exists_impl(return_value, name, autoload, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT);
+
+flf_clean:
+	Z_FLF_PARAM_FREE_STR(1, name_tmp);
+}
+
 /* {{{ Checks if the class exists */
 ZEND_FUNCTION(interface_exists)
 {

Zend/zend_builtin_functions.h

@@ -28,6 +28,7 @@ BEGIN_EXTERN_C()
 ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int options, int limit);
 
 extern ZEND_FRAMELESS_FUNCTION(class_exists, 1);
+extern ZEND_FRAMELESS_FUNCTION(class_exists, 2);
 END_EXTERN_C()
 
 #endif /* ZEND_BUILTIN_FUNCTIONS_H */

Zend/zend_builtin_functions.stub.php

@@ -73,6 +73,7 @@ function property_exists($object_or_class, string $property): bool {}
 
 /**
  * @frameless-function {"arity": 1}
+ * @frameless-function {"arity": 2}
  */
 function class_exists(string $class, bool $autoload = true): bool {}
 

Zend/zend_builtin_functions_arginfo.h

@@ -4610,22 +4610,8 @@ static zend_result zend_compile_frameless_icall(znode *result, zend_ast_list *ar
 	return FAILURE;
 }
 
-static zend_result zend_try_compile_special_func(znode *result, zend_string *lcname, zend_ast_list *args, zend_function *fbc, uint32_t type) /* {{{ */
+static zend_result zend_try_compile_special_func_ex(znode *result, zend_string *lcname, zend_ast_list *args, zend_function *fbc, uint32_t type) /* {{{ */
 {
-	if (CG(compiler_options) & ZEND_COMPILE_NO_BUILTINS) {
-		return FAILURE;
-	}
-
-	if (fbc->type != ZEND_INTERNAL_FUNCTION) {
-		/* If the function is part of disabled_functions, it may be redeclared as a userland
-		 * function with a different implementation. Don't use the VM builtin in that case. */
-		return FAILURE;
-	}
-
-	if (zend_args_contain_unpack_or_named(args)) {
-		return FAILURE;
-	}
-
 	if (zend_string_equals_literal(lcname, "strlen")) {
 		return zend_compile_func_strlen(result, args);
 	} else if (zend_string_equals_literal(lcname, "is_null")) {
@@ -4690,13 +4676,33 @@ static zend_result zend_try_compile_special_func(znode *result, zend_string *lcn
 		return zend_compile_func_array_slice(result, args);
 	} else if (zend_string_equals_literal(lcname, "array_key_exists")) {
 		return zend_compile_func_array_key_exists(result, args);
-	} else if (zend_compile_frameless_icall(result, args, fbc, type) == SUCCESS) {
-		return SUCCESS;
 	} else {
 		return FAILURE;
 	}
 }
-/* }}} */
+
+static zend_result zend_try_compile_special_func(znode *result, zend_string *lcname, zend_ast_list *args, zend_function *fbc, uint32_t type) /* {{{ */
+{
+	if (CG(compiler_options) & ZEND_COMPILE_NO_BUILTINS) {
+		return FAILURE;
+	}
+
+	if (fbc->type != ZEND_INTERNAL_FUNCTION) {
+		/* If the function is part of disabled_functions, it may be redeclared as a userland
+		 * function with a different implementation. Don't use the VM builtin in that case. */
+		return FAILURE;
+	}
+
+	if (zend_args_contain_unpack_or_named(args)) {
+		return FAILURE;
+	}
+
+	if (zend_try_compile_special_func_ex(result, lcname, args, fbc, type) == SUCCESS) {
+		return SUCCESS;
+	}
+
+	return zend_compile_frameless_icall(result, args, fbc, type);
+}
 
 static void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{{ */
 {