Skip to content

ext/standard: Optimize symbol table lookup by using zend_hash_lookup #21537

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

Open
arshidkv12 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

ext/standard: Optimize symbol table lookup by using zend_hash_lookup #21537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,7 +1940,7 @@ static zend_long php_extract_ref_prefix_if_exists(const zend_array *arr, zend_ar
} else {
ZVAL_MAKE_REF_EX(entry, 2);
}
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
Copy link
Member

@iluuu1994 iluuu1994 Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are not fully equivalent. zend_hash_lookup() will never return NULL when the element wasn't found, but a new null-initialized zval to be populated. So the branch should be removed. The rest looks functionally identical, but you'll also need to verify it's actually better/faster.

Copy link
Contributor Author

@arshidkv12 arshidkv12 Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, I'll verify the behavior and performance.

if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -1988,7 +1988,7 @@ static zend_long php_extract_prefix_if_exists(const zend_array *arr, zend_array
ZEND_ASSERT(!zend_string_equals(final_name, ZSTR_KNOWN(ZEND_STR_THIS)));

ZVAL_DEREF(entry);
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -2053,7 +2053,7 @@ prefix:;
} else {
ZVAL_MAKE_REF_EX(entry, 2);
}
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -2119,7 +2119,7 @@ prefix:;
ZEND_ASSERT(!zend_string_equals(final_name, ZSTR_KNOWN(ZEND_STR_THIS)));

ZVAL_DEREF(entry);
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -2181,7 +2181,7 @@ static zend_long php_extract_ref_prefix_all(const zend_array *arr, zend_array *s
} else {
ZVAL_MAKE_REF_EX(entry, 2);
}
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -2223,7 +2223,7 @@ static zend_long php_extract_prefix_all(const zend_array *arr, zend_array *symbo
ZEND_ASSERT(!zend_string_equals(final_name, ZSTR_KNOWN(ZEND_STR_THIS)));

ZVAL_DEREF(entry);
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -2283,7 +2283,7 @@ static zend_long php_extract_ref_prefix_invalid(const zend_array *arr, zend_arra
} else {
ZVAL_MAKE_REF_EX(entry, 2);
}
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down Expand Up @@ -2334,7 +2334,7 @@ static zend_long php_extract_prefix_invalid(const zend_array *arr, zend_array *s
ZEND_ASSERT(!zend_string_equals(final_name, ZSTR_KNOWN(ZEND_STR_THIS)));

ZVAL_DEREF(entry);
if ((orig_var = zend_hash_find(symbol_table, final_name)) != NULL) {
if ((orig_var = zend_hash_lookup(symbol_table, final_name)) != NULL) {
if (Z_TYPE_P(orig_var) == IS_INDIRECT) {
orig_var = Z_INDIRECT_P(orig_var);
}
Expand Down
Loading