Fix GH-8841: error on return type check of func declaration isn't removing the function from function_table

Author: alexandre-daubois

Zend/zend_compile.c

@@ -4794,8 +4794,13 @@ void zend_compile_return(zend_ast *ast) /* {{{ */
 
 	/* Generator return types are handled separately */
 	if (!is_generator && (CG(active_op_array)->fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) {
-		zend_emit_return_type_check(
-			expr_ast ? &expr_node : NULL, CG(active_op_array)->arg_info - 1, 0);
+        zend_try {
+            zend_emit_return_type_check(
+                expr_ast ? &expr_node : NULL, CG(active_op_array)->arg_info - 1, 0);
+        } zend_catch {
+            zend_hash_del(CG(function_table), CG(active_op_array)->function_name);
+            zend_bailout();
+        } zend_end_try();
 	}
 
 	zend_handle_loops_and_finally((expr_node.op_type & (IS_TMP_VAR | IS_VAR)) ? &expr_node : NULL);

sapi/cli/tests/gh8841.phpt

@@ -0,0 +1,68 @@
+--TEST--
+GH-8841: Fix invalid return type compilation doesn't register function
+--SKIPIF--
+<?php
+include "skipif.inc";
+if (!extension_loaded('readline') || readline_info('done') === NULL) {
+    die ("skip need readline support");
+}
+?>
+--FILE--
+<?php
+$php = getenv('TEST_PHP_EXECUTABLE');
+
+// disallow console escape sequences that may break the output
+putenv('TERM=VT100');
+
+$codes = array();
+
+$codes[1] = <<<EOT
+function f(\$x): void { return \$x; }
+f(1);
+EOT;
+
+$codes[2] = <<<EOT
+function f(\$x): void { return \$x; }
+function f(\$x): int { return \$x; }
+echo f(1);
+EOT;
+
+foreach ($codes as $key => $code) {
+    echo "\n--------------\nSnippet no. $key:\n--------------\n";
+    $code = escapeshellarg($code);
+    echo `echo $code | "$php" -a`, "\n";
+}
+
+echo "\nDone\n";
+?>
+--EXPECT--
+--------------
+Snippet no. 1:
+--------------
+Interactive shell
+
+php > function f($x): void { return $x; }
+
+Fatal error: A void function must not return a value in php shell code on line 1
+php > f(1);
+
+Warning: Uncaught Error: Call to undefined function f() in php shell code:1
+Stack trace:
+#0 {main}
+  thrown in php shell code on line 1
+php > 
+
+--------------
+Snippet no. 2:
+--------------
+Interactive shell
+
+php > function f($x): void { return $x; }
+
+Fatal error: A void function must not return a value in php shell code on line 1
+php > function f($x): int { return $x; }
+php > echo f(1);
+1
+php > 
+
+Done