isPartial, drop use of abstract, add flag for partial

krakjoe · krakjoe · commit 54d8c5517fe9 · 2021-05-15T14:56:03.000+02:00
diff --git a/Zend/tests/partial_function/type-check.phpt b/Zend/tests/partial_function/type-check.phpt
@@ -41,7 +41,7 @@ print $r->getReturnType() . PHP_EOL;
 1
 int
 int
-Function [ <user> abstract function volume ] {
+Function [ <user> partial function volume ] {
   @@ %s %d - %d
 
   - Parameters [1] {
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -75,7 +75,7 @@ static bool zend_valid_closure_binding(
 	zend_function *func = &closure->func;
 	bool is_fake_closure = (func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) != 0;
 	
-	if (func->common.fn_flags & ZEND_ACC_ABSTRACT) {
+	if (func->common.fn_flags & ZEND_ACC_PARTIAL) {
 	    zend_error(E_WARNING, "Cannot bind an instance to a partial Closure");
 	    return 0;
 	}
@@ -435,7 +435,7 @@ ZEND_API zval* zend_get_closure_this_ptr(zval *obj) /* {{{ */
 {
 	zend_closure *closure = (zend_closure *)Z_OBJ_P(obj);
 	
-	if (closure->func.common.fn_flags & ZEND_ACC_ABSTRACT) {
+	if (closure->func.common.fn_flags & ZEND_ACC_PARTIAL) {
 	    return NULL;
 	}
 	
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -357,6 +357,9 @@ typedef struct _zend_oparray_context {
 /* method flag used by Closure::__invoke() (int only)     |     |     |     */
 #define ZEND_ACC_USER_ARG_INFO           (1 << 26) /*     |  X  |     |     */
 /*                                                        |     |     |     */
+/* flag used by partial application (int only)            |     |     |     */
+#define ZEND_ACC_PARTIAL                 (1 << 27) /*     |  X  |     |     */
+/*                                                        |     |     |     */
 /* trampoline is permanent                                |     |     |     */
 #define ZEND_ACC_TRAMPOLINE_PERMANENT    (1 << 29)  /*    |  X  |     |     */
 /*                                                        |     |     |     */
diff --git a/Zend/zend_partial.c b/Zend/zend_partial.c
@@ -38,7 +38,7 @@ static zend_object_handlers zend_partial_handlers;
 static zend_always_inline zend_object* zend_partial_this(zend_object *object) {
 	while (object && instanceof_function(object->ce, zend_ce_closure)) {
 		zend_partial *ptr = (zend_partial*) object;
-		if (!(ptr->prototype.common.fn_flags & ZEND_ACC_ABSTRACT)) {
+		if (!(ptr->prototype.common.fn_flags & ZEND_ACC_PARTIAL)) {
 			break;
 		}
 		if (Z_TYPE(ptr->This) == IS_OBJECT) {
@@ -62,7 +62,7 @@ static zend_always_inline zend_partial* zend_partial_parent(zval *This) {
 
 	zend_partial *ptr = (zend_partial*) Z_OBJ_P(This);
 
-	if (!(ptr->prototype.common.fn_flags & ZEND_ACC_ABSTRACT)) {
+	if (!(ptr->prototype.common.fn_flags & ZEND_ACC_PARTIAL)) {
 		return NULL;
 	}
 
@@ -114,7 +114,7 @@ static zend_always_inline void zend_partial_prototype_u(zend_partial *partial, z
 		arg++;
 	}
 
-	partial->prototype.common.fn_flags |= ZEND_ACC_ABSTRACT;
+	partial->prototype.common.fn_flags |= ZEND_ACC_PARTIAL;
 
 	if (partial->prototype.common.fn_flags & ZEND_ACC_VARIADIC &&
 		partial->prototype.common.num_args > 0) {
@@ -167,7 +167,7 @@ static zend_always_inline void zend_partial_prototype_i(zend_partial *partial, z
 		arg++;
 	}
 
-	partial->prototype.common.fn_flags |= ZEND_ACC_ABSTRACT;
+	partial->prototype.common.fn_flags |= ZEND_ACC_PARTIAL;
 
 	if (partial->prototype.common.fn_flags & ZEND_ACC_VARIADIC &&
 		partial->prototype.common.num_args > 0) {
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -803,6 +803,9 @@ static void _function_string(smart_str *str, zend_function *fptr, zend_class_ent
 	if (fptr->common.fn_flags & ZEND_ACC_ABSTRACT) {
 		smart_str_appends(str, "abstract ");
 	}
+	if (fptr->common.fn_flags & ZEND_ACC_PARTIAL) {
+		smart_str_appends(str, "partial ");
+	}
 	if (fptr->common.fn_flags & ZEND_ACC_FINAL) {
 		smart_str_appends(str, "final ");
 	}
@@ -1569,7 +1572,9 @@ ZEND_METHOD(ReflectionFunction, __construct)
 		zval_ptr_dtor(reflection_prop_name(object));
 	}
 
-	ZVAL_STR_COPY(reflection_prop_name(object), fptr->common.function_name);
+    if (fptr->common.function_name) {
+	    ZVAL_STR_COPY(reflection_prop_name(object), fptr->common.function_name);
+    }
 	intern->ptr = fptr;
 	intern->ref_type = REF_TYPE_FUNCTION;
 	if (closure_obj) {
@@ -1622,7 +1627,21 @@ ZEND_METHOD(ReflectionFunctionAbstract, isClosure)
 		RETURN_THROWS();
 	}
 	GET_REFLECTION_OBJECT_PTR(fptr);
-	RETURN_BOOL(fptr->common.fn_flags & ZEND_ACC_CLOSURE);
+	RETURN_BOOL(fptr->common.fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_PARTIAL));
+}
+/* }}} */
+
+/* {{{ Returns whether this is a partial closure */
+ZEND_METHOD(ReflectionFunctionAbstract, isPartial)
+{
+	reflection_object *intern;
+	zend_function *fptr;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		RETURN_THROWS();
+	}
+	GET_REFLECTION_OBJECT_PTR(fptr);
+	RETURN_BOOL(fptr->common.fn_flags & ZEND_ACC_PARTIAL);
 }
 /* }}} */
 
diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php
@@ -29,6 +29,9 @@ public function inNamespace() {}
     /** @return bool */
     public function isClosure() {}
 
+    /** @return bool */
+    public function isPartial() {}
+
     /** @return bool */
     public function isDeprecated() {}
 
diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 47ac64b027cdeb0e9996147277f79fa9d6b876bd */
+ * Stub hash: 4045473013d5e31db023746ead0ea491eb551f7e */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
@@ -13,6 +13,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_ReflectionFunctionAbstract_isClosure arginfo_class_ReflectionFunctionAbstract_inNamespace
 
+#define arginfo_class_ReflectionFunctionAbstract_isPartial arginfo_class_ReflectionFunctionAbstract_inNamespace
+
 #define arginfo_class_ReflectionFunctionAbstract_isDeprecated arginfo_class_ReflectionFunctionAbstract_inNamespace
 
 #define arginfo_class_ReflectionFunctionAbstract_isInternal arginfo_class_ReflectionFunctionAbstract_inNamespace
@@ -546,6 +548,7 @@ ZEND_METHOD(Reflection, getModifierNames);
 ZEND_METHOD(ReflectionClass, __clone);
 ZEND_METHOD(ReflectionFunctionAbstract, inNamespace);
 ZEND_METHOD(ReflectionFunctionAbstract, isClosure);
+ZEND_METHOD(ReflectionFunctionAbstract, isPartial);
 ZEND_METHOD(ReflectionFunctionAbstract, isDeprecated);
 ZEND_METHOD(ReflectionFunctionAbstract, isInternal);
 ZEND_METHOD(ReflectionFunctionAbstract, isUserDefined);
@@ -782,6 +785,7 @@ static const zend_function_entry class_ReflectionFunctionAbstract_methods[] = {
 	ZEND_MALIAS(ReflectionClass, __clone, __clone, arginfo_class_ReflectionFunctionAbstract___clone, ZEND_ACC_PRIVATE)
 	ZEND_ME(ReflectionFunctionAbstract, inNamespace, arginfo_class_ReflectionFunctionAbstract_inNamespace, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionFunctionAbstract, isClosure, arginfo_class_ReflectionFunctionAbstract_isClosure, ZEND_ACC_PUBLIC)
+	ZEND_ME(ReflectionFunctionAbstract, isPartial, arginfo_class_ReflectionFunctionAbstract_isPartial, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionFunctionAbstract, isDeprecated, arginfo_class_ReflectionFunctionAbstract_isDeprecated, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionFunctionAbstract, isInternal, arginfo_class_ReflectionFunctionAbstract_isInternal, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionFunctionAbstract, isUserDefined, arginfo_class_ReflectionFunctionAbstract_isUserDefined, ZEND_ACC_PUBLIC)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ print $r->getReturnType() . PHP_EOL;`
`41`	`41`	`1`
`42`	`42`	`int`
`43`	`43`	`int`
`44`		`-Function [ <user> abstract function volume ] {`
	`44`	`+Function [ <user> partial function volume ] {`
`45`	`45`	`@@ %s %d - %d`
`46`	`46`
`47`	`47`	`- Parameters [1] {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ static bool zend_valid_closure_binding(`
`75`	`75`	`zend_function *func = &closure->func;`
`76`	`76`	`bool is_fake_closure = (func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) != 0;`
`77`	`77`
`78`		`- if (func->common.fn_flags & ZEND_ACC_ABSTRACT) {`
	`78`	`+ if (func->common.fn_flags & ZEND_ACC_PARTIAL) {`
`79`	`79`	`zend_error(E_WARNING, "Cannot bind an instance to a partial Closure");`
`80`	`80`	`return 0;`
`81`	`81`	`}`
`@@ -435,7 +435,7 @@ ZEND_API zval* zend_get_closure_this_ptr(zval obj) / {{{ */`
`435`	`435`	`{`
`436`	`436`	`zend_closure closure = (zend_closure )Z_OBJ_P(obj);`
`437`	`437`
`438`		`- if (closure->func.common.fn_flags & ZEND_ACC_ABSTRACT) {`
	`438`	`+ if (closure->func.common.fn_flags & ZEND_ACC_PARTIAL) {`
`439`	`439`	`return NULL;`
`440`	`440`	`}`
`441`	`441`