Implement frameless static calls

Author: iluuu1994

Zend/Optimizer/zend_dump.c

@@ -465,7 +465,10 @@ ZEND_API void zend_dump_op(const zend_op_array *op_array, const zend_basic_block
 
 	if (ZEND_OP_IS_FRAMELESS_ICALL(opline->opcode)) {
 		zend_function *func = ZEND_FLF_FUNC(opline);
-		fprintf(stderr, "(%s)", ZSTR_VAL(func->common.function_name));
+		fprintf(stderr, "(%s%s%s)",
+			func->common.scope ? ZSTR_VAL(func->common.scope->name) : "",
+			func->common.scope ? "::" : "",
+			ZSTR_VAL(func->common.function_name));
 	}
 
 	if (ZEND_VM_EXT_NUM == (flags & ZEND_VM_EXT_MASK)) {

Zend/zend_compile.c

@@ -59,6 +59,13 @@
 
 #define FC(member) (CG(file_context).member)
 
+#define ZEND_OP1_LITERAL(opline)		(op_array)->literals[(opline)->op1.constant]
+#define ZEND_OP2_LITERAL(opline)		(op_array)->literals[(opline)->op2.constant]
+#define literal_dtor(zv) do { \
+		zval_ptr_dtor_nogc(zv); \
+		ZVAL_NULL(zv); \
+	} while (0)
+
 typedef struct _zend_loop_var {
 	uint8_t opcode;
 	uint8_t var_type;
@@ -5333,6 +5340,7 @@ static void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type
 		}
 	}
 
+	uint32_t init_opnum = get_next_op_number();
 	opline = get_next_op();
 	opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
 
@@ -5375,6 +5383,21 @@ static void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type
 		}
 	}
 
+	if (!(CG(compiler_options) & ZEND_COMPILE_NO_BUILTINS)
+	 && (fbc->type == ZEND_INTERNAL_FUNCTION)
+	 && zend_ast_is_list(args_ast)
+	 && !zend_args_contain_unpack_or_named(zend_ast_get_list(args_ast))) {
+		if (zend_compile_frameless_icall(result, zend_ast_get_list(args_ast), fbc, type) != (uint32_t)-1) {
+			/* Update opline in case it got invalidated. */
+			zend_op_array *op_array = CG(active_op_array);
+			opline = &op_array->opcodes[init_opnum];
+			literal_dtor(&ZEND_OP1_LITERAL(opline));
+			literal_dtor(&ZEND_OP2_LITERAL(opline));
+			MAKE_NOP(opline);
+			return;
+		}
+	}
+
 	zend_compile_call_common(result, args_ast, fbc, zend_ast_get_lineno(method_ast));
 }
 /* }}} */

build/gen_stub.php

@@ -1118,6 +1118,10 @@ public function getDeclarationClassName(): string {
         return implode('_', $this->className->getParts());
     }
 
+    public function getDeclarationName(): string {
+        return "{$this->getDeclarationClassName()}_{$this->methodName}";
+    }
+
     public function getDeclaration(): string {
         return "ZEND_METHOD({$this->getDeclarationClassName()}, $this->methodName);\n";
     }
@@ -1126,6 +1130,10 @@ public function getArgInfoName(): string {
         return "arginfo_class_{$this->getDeclarationClassName()}_{$this->methodName}";
     }
 
+    public function getFramelessFunctionInfosName(): string {
+        return "frameless_function_infos_{$this->className}_{$this->methodName}";
+    }
+
     public function getMethodSynopsisFilename(): string
     {
         $parts = [...$this->className->getParts(), ltrim($this->methodName, '_')];
@@ -1396,12 +1404,12 @@ public function getFramelessDeclaration(FuncInfo $funcInfo): ?string {
         }
 
         foreach ($this->framelessFunctionInfos as $framelessFunctionInfo) {
-            $code .= "ZEND_FRAMELESS_FUNCTION({$this->name->getFunctionName()}, {$framelessFunctionInfo->arity});\n";
+            $code .= "ZEND_FRAMELESS_FUNCTION({$this->name->getDeclarationName()}, {$framelessFunctionInfo->arity});\n";
         }
 
         $code .= 'static const zend_frameless_function_info ' . $this->getFramelessFunctionInfosName() . "[] = {\n";
         foreach ($this->framelessFunctionInfos as $framelessFunctionInfo) {
-            $code .= "\t{ ZEND_FRAMELESS_FUNCTION_NAME({$this->name->getFunctionName()}, {$framelessFunctionInfo->arity}), {$framelessFunctionInfo->arity} },\n";
+            $code .= "\t{ ZEND_FRAMELESS_FUNCTION_NAME({$this->name->getDeclarationName()}, {$framelessFunctionInfo->arity}), {$framelessFunctionInfo->arity} },\n";
         }
         $code .= "\t{ 0 },\n";
         $code .= "};\n";
@@ -1427,10 +1435,10 @@ public function getFunctionEntry(): string {
         $functionEntryCode = null;
 
         if (!empty($this->framelessFunctionInfos)) {
-            if ($this->isMethod()) {
-                throw new Exception('Frameless methods are not supported yet');
+            if ($this->isMethod() && !($this->flags & Modifiers::STATIC)) {
+                throw new Exception('Frameless methods must be static');
             }
-            if ($this->name->getNamespace()) {
+            if (!$this->isMethod() && $this->name->getNamespace()) {
                 throw new Exception('Namespaced direct calls to frameless functions are not supported yet');
             }
             if ($this->alias) {
@@ -5161,7 +5169,7 @@ function findEquivalentFuncInfo(array $generatedFuncInfos, FuncInfo $funcInfo):
 function generateCodeWithConditions(
     iterable $infos, string $separator, Closure $codeGenerator, ?string $parentCond = null): string {
     $code = "";
-    
+
     // For combining the conditional blocks of the infos with the same condition
     $openCondition = null;
     foreach ($infos as $info) {

ext/zend_test/test.c

@@ -1154,6 +1154,30 @@ static ZEND_METHOD(_ZendTestClass, takesUnionType)
 	RETURN_NULL();
 }
 
+static ZEND_METHOD(_ZendTestClass, framelessStaticMethod)
+{
+	zend_long lhs, rhs;
+
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_LONG(lhs)
+		Z_PARAM_LONG(rhs)
+	ZEND_PARSE_PARAMETERS_END();
+
+	RETURN_LONG(lhs + rhs);
+}
+
+ZEND_FRAMELESS_FUNCTION(_ZendTestClass_framelessStaticMethod, 2)
+{
+	zend_long lhs, rhs;
+
+	Z_FLF_PARAM_LONG(1, lhs);
+	Z_FLF_PARAM_LONG(2, rhs);
+
+	ZVAL_LONG(return_value, lhs + rhs);
+
+flf_clean:;
+}
+
 // Returns a newly allocated DNF type `Iterator|(Traversable&Countable)`.
 //
 // We need to generate it "manually" because gen_stubs.php does not support codegen for DNF types ATM.

ext/zend_test/test.stub.php

@@ -68,6 +68,9 @@ public function returnsThrowable(): Throwable {}
         static public function variadicTest(string|Iterator ...$elements) : static {}
 
         public function takesUnionType(stdclass|Iterator $arg): void {}
+
+        /** @frameless-function {"arity": 2} */
+        public static function framelessStaticMethod(int $lhs, int $rhs): int {}
     }
 
     class _ZendTestMagicCall

ext/zend_test/test_arginfo.h

@@ -0,0 +1,12 @@
+--TEST--
+Frameless static methods
+--EXTENSIONS--
+zend_test
+--FILE--
+<?php
+
+var_dump(_ZendTestClass::framelessStaticMethod(42, 69));
+
+?>
+--EXPECT--
+int(111)