Skip to content

Commit c2bd66c

Browse files
committed
zend_globals: Rename in_autoload to autoload_current_classnames
The old name `in_autoload` was somewhat misleading by implying a `bool`ean value rather than a `HashTable`. Since the previous change to embed the `HashTable` is breaking anyway, we can also rename it.
1 parent 8f25490 commit c2bd66c

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

Zend/zend_execute_API.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void init_executor(void) /* {{{ */
155155
zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_activator);
156156

157157
zend_hash_init(&EG(included_files), 8, NULL, NULL, 0);
158-
zend_hash_init(&EG(in_autoload), 8, NULL, NULL, 0);
158+
zend_hash_init(&EG(autoload_current_classnames), 8, NULL, NULL, 0);
159159

160160
EG(ticks_count) = 0;
161161

@@ -503,7 +503,7 @@ void shutdown_executor(void) /* {{{ */
503503
}
504504

505505
zend_hash_destroy(&EG(included_files));
506-
zend_hash_destroy(&EG(in_autoload));
506+
zend_hash_destroy(&EG(autoload_current_classnames));
507507

508508
zend_stack_destroy(&EG(user_error_handlers_error_reporting));
509509
zend_stack_destroy(&EG(user_error_handlers));
@@ -1242,7 +1242,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
12421242
return NULL;
12431243
}
12441244

1245-
if (zend_hash_add_empty_element(&EG(in_autoload), lc_name) == NULL) {
1245+
if (zend_hash_add_empty_element(&EG(autoload_current_classnames), lc_name) == NULL) {
12461246
if (!key) {
12471247
zend_string_release_ex(lc_name, 0);
12481248
}
@@ -1264,7 +1264,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
12641264
EG(lineno_override) = previous_lineno;
12651265

12661266
zend_string_release_ex(autoload_name, 0);
1267-
zend_hash_del(&EG(in_autoload), lc_name);
1267+
zend_hash_del(&EG(autoload_current_classnames), lc_name);
12681268

12691269
if (!key) {
12701270
zend_string_release_ex(lc_name, 0);

Zend/zend_globals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ struct _zend_executor_globals {
220220
zend_atomic_bool vm_interrupt;
221221
zend_atomic_bool timed_out;
222222

223-
HashTable in_autoload;
223+
HashTable autoload_current_classnames;
224224

225225
zend_long hard_timeout;
226226
void *stack_base;

0 commit comments

Comments
 (0)