Skip to content

Zend: Refactor deduplicate auto-global checks #22963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LamentXU123 merged 3 commits into from
Jul 31, 2026
+14 −17
Merged

Zend: Refactor deduplicate auto-global checks #22963

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e968f4
Zend: Refactor deduplicate auto-global checks
LamentXU123 Jul 31, 2026
9e04be3
Zend: fix typo `backtreace`
LamentXU123 Jul 31, 2026
8980a0f
[skip ci] Revert typo change
LamentXU123 Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1995,30 +1995,27 @@ static void zend_do_extended_fcall_end(void) /* {{{ */
}
/* }}} */

ZEND_API bool zend_is_auto_global_str(const char *name, size_t len) /* {{{ */ {
zend_auto_global *auto_global;
static zend_always_inline bool zend_auto_global_check(zend_auto_global *auto_global)
{
if (auto_global == NULL) {
return false;
}

if ((auto_global = zend_hash_str_find_ptr(CG(auto_globals), name, len)) != NULL) {
if (auto_global->armed) {
auto_global->armed = auto_global->auto_global_callback(auto_global->name);
}
return 1;
if (auto_global->armed) {
auto_global->armed = auto_global->auto_global_callback(auto_global->name);
}
return 0;
return true;
}

ZEND_API bool zend_is_auto_global_str(const char *name, size_t len) /* {{{ */
{
return zend_auto_global_check(zend_hash_str_find_ptr(CG(auto_globals), name, len));
}
/* }}} */

ZEND_API bool zend_is_auto_global(zend_string *name) /* {{{ */
{
zend_auto_global *auto_global;

if ((auto_global = zend_hash_find_ptr(CG(auto_globals), name)) != NULL) {
if (auto_global->armed) {
auto_global->armed = auto_global->auto_global_callback(auto_global->name);
}
return 1;
}
return 0;
return zend_auto_global_check(zend_hash_find_ptr(CG(auto_globals), name));
}
/* }}} */

Expand Down