[RFC] Flip ns call scope lookup order

Zend/tests/bug74164.phpt

@@ -9,12 +9,13 @@ set_error_handler(function ($type, $msg) {
     throw new \Exception($msg);
 });
 
-call_user_func(function (array &$ref) {var_dump("xxx");}, 'not_an_array_variable');
+$fn = 'call_user_func';
+$fn(function (array &$ref) {var_dump("xxx");}, 'not_an_array_variable');
 ?>
 --EXPECTF--
 Fatal error: Uncaught Exception: {closure:%s:%d}(): Argument #1 ($ref) must be passed by reference, value given in %s:%d
 Stack trace:
-#0 [internal function]: {closure:%s:%d}(2, '%s', '%s', 9)
+#0 [internal function]: {closure:%s:%d}(2, '%s', '%s', 10)
 #1 %sbug74164.php(%d): call_user_func(%s)
 #2 {main}
   thrown in %sbug74164.php on line %d

Zend/tests/call_user_func_strict_arginfo_check.phpt

@@ -7,7 +7,8 @@ declare(strict_types=1);
 namespace Foo;
 
 // strlen() will be called with strict_types=0, so this is legal.
-var_dump(call_user_func('strlen', false));
+$fn = 'call_user_func';
+var_dump($fn('strlen', false));
 
 ?>
 --EXPECT--

Zend/tests/frameless_jmp_004.phpt

@@ -13,5 +13,4 @@ declare_local_class_exists();
 var_dump(CLASS_EXISTS('Foo'));
 ?>
 --EXPECT--
-string(16) "Foo\class_exists"
-bool(true)
+bool(false)

Zend/tests/ns_013.phpt

@@ -11,4 +11,4 @@ function strlen($x) {
 echo strlen("Hello"),"\n";
 ?>
 --EXPECT--
-test\ns1\strlen
+5

Zend/zend_compile.c

@@ -614,17 +614,17 @@ static int zend_add_ns_func_name_literal(zend_string *name) /* {{{ */
 	/* Original name */
 	int ret = zend_add_literal_string(&name);
 
-	/* Lowercased name */
-	zend_string *lc_name = zend_string_tolower(name);
-	zend_add_literal_string(&lc_name);
-
 	/* Lowercased unqualified name */
 	if (zend_get_unqualified_name(name, &unqualified_name, &unqualified_name_len)) {
-		lc_name = zend_string_alloc(unqualified_name_len, 0);
+		zend_string *lc_name = zend_string_alloc(unqualified_name_len, 0);
 		zend_str_tolower_copy(ZSTR_VAL(lc_name), unqualified_name, unqualified_name_len);
 		zend_add_literal_string(&lc_name);
 	}
 
+	/* Lowercased name */
+	zend_string *lc_name = zend_string_tolower(name);
+	zend_add_literal_string(&lc_name);
+
 	return ret;
 }
 /* }}} */
@@ -1016,9 +1016,11 @@ static zend_string *zend_prefix_with_ns(zend_string *name) {
 	}
 }
 
+static bool zend_compile_ignore_function(zend_function *fbc, zend_string *filename);
+
 static zend_string *zend_resolve_non_class_name(
 	zend_string *name, uint32_t type, bool *is_fully_qualified,
-	bool case_sensitive, HashTable *current_import_sub
+	bool case_sensitive, bool function
 ) {
 	char *compound;
 	*is_fully_qualified = 0;
@@ -1039,6 +1041,7 @@ static zend_string *zend_resolve_non_class_name(
 		return zend_prefix_with_ns(name);
 	}
 
+	HashTable *current_import_sub = function ? FC(imports_function) : FC(imports_const);
 	if (current_import_sub) {
 		/* If an unqualified name is a function/const alias, replace it. */
 		zend_string *import_name;
@@ -1070,20 +1073,33 @@ static zend_string *zend_resolve_non_class_name(
 		}
 	}
 
+	if (!compound && function) {
+		zend_string *lcname = zend_string_tolower(name);
+		zval *fbc_zv = zend_hash_find(CG(function_table), lcname);
+		if (fbc_zv
+		 && CG(active_op_array)
+		 && !zend_compile_ignore_function(Z_PTR_P(fbc_zv), CG(active_op_array)->filename)) {
+			*is_fully_qualified = true;
+			zend_string_release(lcname);
+			return zend_string_copy(name);
+		}
+		zend_string_release(lcname);
+	}
+
 	return zend_prefix_with_ns(name);
 }
 /* }}} */
 
 static zend_string *zend_resolve_function_name(zend_string *name, uint32_t type, bool *is_fully_qualified)
 {
 	return zend_resolve_non_class_name(
-		name, type, is_fully_qualified, 0, FC(imports_function));
+		name, type, is_fully_qualified, 0, /* function */ true);
 }
 
 static zend_string *zend_resolve_const_name(zend_string *name, uint32_t type, bool *is_fully_qualified)
 {
 	return zend_resolve_non_class_name(
-		name, type, is_fully_qualified, 1, FC(imports_const));
+		name, type, is_fully_qualified, 1, /* function */ false);
 }
 
 static zend_string *zend_resolve_class_name(zend_string *name, uint32_t type) /* {{{ */

benchmark/benchmark.php

@@ -25,8 +25,8 @@ function main() {
     $data['Zend/bench.php JIT'] = runBench(true);
     $data['Symfony Demo 2.2.3'] = runSymfonyDemo(false);
     $data['Symfony Demo 2.2.3 JIT'] = runSymfonyDemo(true);
-    $data['Wordpress 6.2'] = runWordpress(false);
-    $data['Wordpress 6.2 JIT'] = runWordpress(true);
+    // $data['Wordpress 6.2'] = runWordpress(false);
+    // $data['Wordpress 6.2 JIT'] = runWordpress(true);
     $result = json_encode($data, JSON_PRETTY_PRINT) . "\n";
 
     fwrite(STDOUT, $result);

ext/reflection/tests/ReflectionFiber_notrace_2.phpt

@@ -5,7 +5,8 @@ ReflectionFiber should not segfault when inspecting fibers where the previous st
 
 namespace test;
 
-$f = new \Fiber(fn() => call_user_func(["Fiber", "suspend"]));
+$fn = 'call_user_func';
+$f = new \Fiber(fn() => $fn(["Fiber", "suspend"]));
 $f->start();
 
 $reflection = new \ReflectionFiber($f);
@@ -17,7 +18,7 @@ var_dump($reflection->getTrace());
 ?>
 --EXPECTF--
 string(%d) "%sReflectionFiber_notrace_2.php"
-int(5)
+int(6)
 array(3) {
   [0]=>
   array(4) {
@@ -36,7 +37,7 @@ array(3) {
     ["file"]=>
     string(%d) "%sReflectionFiber_notrace_2.php"
     ["line"]=>
-    int(5)
+    int(6)
     ["function"]=>
     string(14) "call_user_func"
     ["args"]=>

ext/zend_test/tests/observer_call_user_func_03.phpt

@@ -22,8 +22,9 @@ namespace Test {
         echo 'my_function called' . PHP_EOL;
     }
 
-    call_user_func('Test\\MyClass::myMethod');
-    call_user_func('Test\\my_function');
+    $fn = 'call_user_func';
+    $fn('Test\\MyClass::myMethod');
+    $fn('Test\\my_function');
 }
 ?>
 --EXPECTF--

ext/zend_test/tests/observer_call_user_func_04.phpt

@@ -22,8 +22,9 @@ namespace Test {
         echo 'my_function ' . $msg . PHP_EOL;
     }
 
-    call_user_func_array('Test\\MyClass::myMethod', ['called']);
-    call_user_func_array('Test\\my_function', ['called']);
+    $fn = 'call_user_func_array';
+    $fn('Test\\MyClass::myMethod', ['called']);
+    $fn('Test\\my_function', ['called']);
 }
 ?>
 --EXPECTF--

sapi/phpdbg/tests/print_001.phpt

@@ -29,9 +29,9 @@ Foo\Bar::Foo:
      ; (lines=5, args=1, vars=1, tmps=%d)
      ; %s:5-7
 L0005 0000 CV0($bar) = RECV 1
-L0006 0001 INIT_NS_FCALL_BY_NAME 1 string("Foo\\var_dump")
-L0006 0002 SEND_VAR_EX CV0($bar) 1
-L0006 0003 DO_FCALL
+L0006 0001 INIT_FCALL %d %d string("var_dump")
+L0006 0002 SEND_VAR CV0($bar) 1
+L0006 0003 DO_ICALL
 L0007 0004 RETURN null
 
 Foo\Bar::baz: