Next review round

Author: Girgias

Zend/zend_autoload.c

@@ -130,7 +130,9 @@ ZEND_API bool zend_autoload_unregister_class_loader(const zend_fcall_info_cache
    return false;
 }
 
-ZEND_API zend_array* zend_autoload_fcc_map_to_callable_zval_map(void) {
+/* We do not return a HashTable* because zend_empty_array is not collectable,
+ * therefore the zval holding this value must do so. Something that ZVAL_EMPTY_ARRAY(); does. */
+ZEND_API void zend_autoload_fcc_map_to_callable_zval_map(zval *return_value) {
    if (zend_class_autoload_functions) {
       zend_fcall_info_cache *fcc;
 
@@ -140,9 +142,9 @@ ZEND_API zend_array* zend_autoload_fcc_map_to_callable_zval_map(void) {
          zend_get_callable_zval_from_fcc(fcc, &tmp);
          zend_hash_next_index_insert(map, &tmp);
       } ZEND_HASH_FOREACH_END();
-      return map;
+      RETURN_ARR(map);
    }
-   return (zend_array*)&zend_empty_array;
+   RETURN_EMPTY_ARRAY();
 }
 
 /* Only for deprecated strange behaviour of spl_autoload_unregister() */

Zend/zend_autoload.h

@@ -24,7 +24,7 @@
 ZEND_API zend_class_entry *zend_perform_class_autoload(zend_string *class_name, zend_string *lc_name);
 ZEND_API void zend_autoload_register_class_loader(zend_fcall_info_cache *fcc, bool prepend);
 ZEND_API bool zend_autoload_unregister_class_loader(const zend_fcall_info_cache *fcc);
-ZEND_API zend_array* zend_autoload_fcc_map_to_callable_zval_map(void);
+ZEND_API void zend_autoload_fcc_map_to_callable_zval_map(zval *return_value);
 /* Only for deprecated strange behaviour of spl_autoload_unregister() */
 ZEND_API void zend_autoload_clean_class_loaders(void);
 void zend_autoload_shutdown(void);

ext/spl/php_spl.c

@@ -432,7 +432,7 @@ PHP_FUNCTION(spl_autoload_functions)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	RETURN_ARR(zend_autoload_fcc_map_to_callable_zval_map());
+	zend_autoload_fcc_map_to_callable_zval_map(return_value);
 } /* }}} */
 
 /* {{{ Return hash id for given object */

main/main.c

@@ -2014,7 +2014,7 @@ void php_request_shutdown(void *dummy)
 		php_free_shutdown_functions();
 	}
 
-	/* 8. Shutdown autoloader, freeing all hold functions/closures */
+	/* 8. Shutdown autoloader, freeing all held functions/closures */
 	zend_autoload_shutdown();
 
 	/* 9. Destroy super-globals */