fixup! Support first-class callables in const-expressions

Author: TimWolla

Zend/tests/closure_const_expr/fcc/error_static_call_instance_method.phpt

@@ -0,0 +1,23 @@
+--TEST--
+FCC in initializer errors for static reference to instance method.
+--FILE--
+<?php
+
+class Foo {
+    public function myMethod(string $foo) {
+        echo "Called ", __METHOD__, PHP_EOL;
+        var_dump($foo);
+    }
+}
+
+const Closure = Foo::myMethod(...);
+
+var_dump(Closure);
+(Closure)("abc");
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Non-static method Foo::myMethod() cannot be called statically in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/zend_ast.c

@@ -1017,7 +1017,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 					zend_string *method_name = zend_ast_get_str(ast->child[1]);
 					fptr = zend_hash_find_ptr_lc(&ce->function_table, method_name);
 					if (!fptr) {
-						zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(method_name));
+						zend_undefined_method(ce, method_name);
 						return FAILURE;
 					}
 					if (!(fptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
@@ -1034,6 +1034,9 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 							}
 						}
 					}
+					if (!(fptr->common.fn_flags & ZEND_ACC_STATIC)) {
+						zend_non_static_method_call(fptr);
+					}
 					break;
 				}
 			}

Zend/zend_execute.c

@@ -2443,7 +2443,7 @@ ZEND_API ZEND_COLD zval* ZEND_FASTCALL zend_undefined_index_write(HashTable *ht,
 	return retval;
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(const zend_class_entry *ce, const zend_string *method)
+ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(const zend_class_entry *ce, const zend_string *method)
 {
 	zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(method));
 }

Zend/zend_execute.h

@@ -436,6 +436,7 @@ ZEND_API void zend_cleanup_unfinished_execution(zend_execute_data *execute_data,
 ZEND_API ZEND_ATTRIBUTE_DEPRECATED HashTable *zend_unfinished_execution_gc(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer);
 ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield);
 ZEND_API zval* ZEND_FASTCALL zend_fetch_static_property(zend_execute_data *ex, int fetch_type);
+ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(const zend_class_entry *ce, const zend_string *method);
 ZEND_API void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc);
 
 ZEND_API void zend_frameless_observed_call(zend_execute_data *execute_data);

ext/opcache/jit/zend_jit_helpers.c

@@ -122,11 +122,6 @@ static ZEND_COLD void ZEND_FASTCALL zend_jit_invalid_method_call_tmp(zval *objec
 	zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(const zend_class_entry *ce, const zend_string *method)
-{
-	zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(method));
-}
-
 static void ZEND_FASTCALL zend_jit_unref_helper(zval *zv)
 {
 	zend_reference *ref;