is_numeric frameless handler, flf decl refactoring

Author: iluuu1994

Zend/zend_builtin_functions.h

@@ -20,15 +20,10 @@
 #ifndef ZEND_BUILTIN_FUNCTIONS_H
 #define ZEND_BUILTIN_FUNCTIONS_H
 
-#include "zend_frameless_function.h"
-
 zend_result zend_startup_builtin_functions(void);
 
 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_arginfo.h

@@ -22,7 +22,6 @@
 #include "zend_types.h"
 #include "zend_gc.h"
 #include "zend_alloc.h"
-#include "zend_frameless_function.h"
 
 BEGIN_EXTERN_C()
 
@@ -643,14 +642,4 @@ ZEND_KNOWN_STRINGS(_ZEND_STR_ID)
 	ZEND_STR_LAST_KNOWN
 } zend_known_string_id;
 
-extern ZEND_FRAMELESS_FUNCTION(dirname, 1);
-extern ZEND_FRAMELESS_FUNCTION(dirname, 2);
-extern ZEND_FRAMELESS_FUNCTION(strpos, 2);
-extern ZEND_FRAMELESS_FUNCTION(strpos, 3);
-extern ZEND_FRAMELESS_FUNCTION(substr, 2);
-extern ZEND_FRAMELESS_FUNCTION(substr, 3);
-extern ZEND_FRAMELESS_FUNCTION(strstr, 2);
-extern ZEND_FRAMELESS_FUNCTION(strstr, 3);
-extern ZEND_FRAMELESS_FUNCTION(str_starts_with, 2);
-
 #endif /* ZEND_STRING_H */

Zend/zend_string.h

@@ -4212,7 +4212,12 @@ function framelessFunctionInfoToCode(FileInfo $fileInfo, FuncInfo $funcInfo): ?s
         return null;
     }
 
-    $code = 'static const zend_frameless_function_info ' . $funcInfo->getFramelessFunctionInfosName() . "[] = {\n";
+    $code = '';
+    foreach ($funcInfo->framelessFunctionInfos as $framelessFunctionInfo) {
+        $code .= "ZEND_FRAMELESS_FUNCTION({$funcInfo->name->getFunctionName()}, {$framelessFunctionInfo->arity});\n";
+    }
+
+    $code .= 'static const zend_frameless_function_info ' . $funcInfo->getFramelessFunctionInfosName() . "[] = {\n";
     foreach ($funcInfo->framelessFunctionInfos as $framelessFunctionInfo) {
         $code .= "\t{ ZEND_FRAMELESS_FUNCTION_NAME({$funcInfo->name->getFunctionName()}, {$framelessFunctionInfo->arity}), {$framelessFunctionInfo->arity} },\n";
     }

build/gen_stub.php

@@ -115,6 +115,7 @@ PHPAPI php_basic_globals basic_globals;
 
 #include "php_fopen_wrappers.h"
 #include "streamsfuncs.h"
+#include "zend_frameless_function.h"
 #include "basic_functions_arginfo.h"
 
 typedef struct _user_tick_function_entry {

ext/standard/basic_functions.c

@@ -3609,6 +3609,7 @@ function is_double(mixed $value): bool {}
 
 /**
  * @compile-time-eval
+ * @frameless-function {"arity": 1}
  */
 function is_numeric(mixed $value): bool {}
 

ext/standard/basic_functions.stub.php

@@ -21,7 +21,6 @@
 #define PHP_ARRAY_H
 
 # include "ext/random/php_random.h"
-# include "zend_frameless_function.h"
 
 PHP_MINIT_FUNCTION(array);
 PHP_MSHUTDOWN_FUNCTION(array);
@@ -70,7 +69,4 @@ ZEND_END_MODULE_GLOBALS(array)
 
 #define ARRAYG(v) ZEND_MODULE_GLOBALS_ACCESSOR(array, v)
 
-ZEND_FRAMELESS_FUNCTION(in_array, 2);
-ZEND_FRAMELESS_FUNCTION(in_array, 3);
-
 #endif /* PHP_ARRAY_H */

ext/standard/basic_functions_arginfo.h

@@ -342,15 +342,8 @@ PHP_FUNCTION(is_object)
 }
 /* }}} */
 
-/* {{{ Returns true if value is a number or a numeric string */
-PHP_FUNCTION(is_numeric)
+static inline void _zend_is_numeric(zval *return_value, zval *arg)
 {
-	zval *arg;
-
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ZVAL(arg)
-	ZEND_PARSE_PARAMETERS_END();
-
 	switch (Z_TYPE_P(arg)) {
 		case IS_LONG:
 		case IS_DOUBLE:
@@ -370,8 +363,29 @@ PHP_FUNCTION(is_numeric)
 			break;
 	}
 }
+
+/* {{{ Returns true if value is a number or a numeric string */
+PHP_FUNCTION(is_numeric)
+{
+	zval *arg;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_ZVAL(arg)
+	ZEND_PARSE_PARAMETERS_END();
+
+	_zend_is_numeric(return_value, arg);
+}
 /* }}} */
 
+ZEND_FRAMELESS_FUNCTION(is_numeric, 1)
+{
+	zval *arg;
+
+	Z_FLF_PARAM_ZVAL(1, arg);
+
+	_zend_is_numeric(return_value, arg);
+}
+
 /* {{{ Returns true if value is a scalar */
 PHP_FUNCTION(is_scalar)
 {