Zend autoloader fallback once

Zend/tests/autoloading/function/global_fallback002.phpt

@@ -1,18 +1,25 @@
 --TEST--
-Fallback to global function should not trigger autoloading.
+Fallback to global function triggers autoloading once.
 --FILE--
 <?php
+
 namespace {
     function loader($name) {
-        echo $name, \PHP_EOL;
+        echo "function loader called with $name\n";
     }
 
     autoload_register_function('loader');
+
+    function foo() {
+        echo "I am foo in global namespace.\n";
+    }
 }
 
 namespace bar {
-	var_dump('Hello');
+	foo();
 }
+
 ?>
 --EXPECT--
-string(5) "Hello"
+function loader called with bar\foo
+I am foo in global namespace.

Zend/tests/autoloading/function/global_fallback003.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Fallback to non-existent function triggers autoloading once in namespace, once in global.
+--FILE--
+<?php
+
+namespace {
+    function loader($name) {
+        echo "function loader called with $name\n";
+    }
+
+    autoload_register_function('loader');
+}
+
+namespace bar {
+    try {
+        non_existent_function();
+    }
+    catch (\Error $e) {
+        echo "Error correctly caught: " . $e->getMessage() . "\n";
+    }
+}
+
+?>
+--EXPECT--
+function loader called with bar\non_existent_function
+function loader called with non_existent_function
+Error correctly caught: Call to undefined function bar\non_existent_function()

Zend/tests/autoloading/function/global_fallback_doesnt_repeat_autoloading.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Fallback to global function should trigger autoloading only once per namespace.
+--FILE--
+<?php
+
+namespace {
+    function loader($name) {
+        echo "function loader called with $name\n";
+    }
+
+    autoload_register_function('loader');
+
+    function foo() {
+        echo "I am foo in global namespace.\n";
+    }
+}
+
+namespace bar {
+    foo();
+
+    for ($i = 0; $i < 3; $i += 1) {
+        foo();
+    }
+}
+namespace bar {
+    foo();
+}
+
+namespace Quux {
+    foo();
+}
+
+?>
+--EXPECT--
+function loader called with bar\foo
+I am foo in global namespace.
+I am foo in global namespace.
+I am foo in global namespace.
+I am foo in global namespace.
+I am foo in global namespace.
+function loader called with Quux\foo
+I am foo in global namespace.

Zend/zend_vm_def.h

@@ -3859,19 +3859,22 @@ 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 */ false);
+		fbc = zend_lookup_function_ex(Z_STR_P(function_name), Z_STR_P(function_name+1), /* use_autoload */ true);
 		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 */ false);
+			fbc = zend_lookup_function_ex(Z_STR_P(function_name+2), Z_STR_P(function_name+2), /* use_autoload */ true);
 			if (fbc == NULL) {
 				if (UNEXPECTED(EG(exception))) {
 					HANDLE_EXCEPTION();
 				}
 				ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper);
 			}
+			else {
+				do_bind_function(fbc, function_name);
+			}
 		}
 		if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
 			init_func_run_time_cache(&fbc->op_array);