Do not run autoloader when resolving unqualified call

Girgias · Nov 28, 2022 · ee63c9b · ee63c9b
1 parent 9ef2a81
commit ee63c9b
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 7 deletions.
diff --git a/Zend/tests/autoloading/function/exceptions_during_autoloading004.phpt b/Zend/tests/autoloading/function/exceptions_during_autoloading004.phpt
@@ -17,29 +17,46 @@ namespace {
     autoload_register_function('autoload_second');
 }
 namespace bar {
+    echo "Try-catch around function_exists()\n";
     try {
         \function_exists('foo');
     } catch (\Exception $e) {
         do {
             echo $e->getMessage()."\n";
         } while ($e = $e->getPrevious());
     }
+    echo "Try-catch around unqualified function call\n";
     try {
         foo();
-    } catch (\Exception $e) {
+    } catch (\Throwable $e) {
+        /* No autoloading for unqualified function names */
         do {
-            echo $e->getMessage()."\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
+        } while ($e = $e->getPrevious());
+    }
+    echo "Try-catch around qualified function call\n";
+    try {
+        \foo();
+    } catch (\Throwable $e) {
+        do {
+            echo $e::class, ': ', $e->getMessage(), "\n";
         } while ($e = $e->getPrevious());
     }
 
+    echo "function_exists() without try-catch\n";
     \function_exists('foo');
 }
 ?>
 --EXPECTF--
+Try-catch around function_exists()
 autoload_first
 first
+Try-catch around unqualified function call
+Error: Call to undefined function bar\foo()
+Try-catch around qualified function call
 autoload_first
-first
+Exception: first
+function_exists() without try-catch
 autoload_first
 
 Fatal error: Uncaught Exception: first in %s:%d

diff --git a/...utoloading/function/namespaces_basic.phpt → ...oloading/function/global_fallback001.phpt b/...utoloading/function/namespaces_basic.phpt → ...oloading/function/global_fallback001.phpt
diff --git a/Zend/tests/autoloading/function/global_fallback002.phpt b/Zend/tests/autoloading/function/global_fallback002.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Fallback to global function should not trigger autoloading.
+--FILE--
+<?php
+namespace {
+    function loader($name) {
+        echo $name, \PHP_EOL;
+    }
+
+    autoload_register_function('loader');
+}
+
+namespace bar {
+	var_dump('Hello');
+}
+?>
+--EXPECT--
+string(5) "Hello"
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -3859,13 +3859,13 @@ ZEND_VM_HOT_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
 	if (UNEXPECTED(fbc == NULL)) {
 		zval *function_name = (zval *)RT_CONSTANT(opline, opline->op2);
 		/* Fetch lowercase name stored in the next literal slot */
-		fbc = zend_lookup_function_ex(Z_STR_P(function_name), Z_STR_P(function_name+1), /* use_autoload */ true);
+		fbc = zend_lookup_function_ex(Z_STR_P(function_name), Z_STR_P(function_name+1), /* use_autoload */ false);
 		if (UNEXPECTED(fbc == NULL)) {
 			if (UNEXPECTED(EG(exception))) {
 				HANDLE_EXCEPTION();
 			}
 			/* Fallback onto global namespace, by fetching the unqualified lowercase name stored in the second literal slot */
-			fbc = zend_lookup_function_ex(Z_STR_P(function_name+2), Z_STR_P(function_name+2), /* use_autoload */ true);
+			fbc = zend_lookup_function_ex(Z_STR_P(function_name+2), Z_STR_P(function_name+2), /* use_autoload */ false);
 			if (fbc == NULL) {
 				if (UNEXPECTED(EG(exception))) {
 					HANDLE_EXCEPTION();

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h