Skip to content

Commit f796c6a

Browse files
GirgiasGirgias
committed
Use knozn static and this zstr
1 parent 2034bc5 commit f796c6a

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3529,7 +3529,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
35293529
*strict_class = 1;
35303530
ret = 1;
35313531
}
3532-
} else if (zend_string_equals_literal(lcname, "static")) {
3532+
} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_STATIC))) {
35333533
zend_class_entry *called_scope = zend_get_called_scope(frame);
35343534

35353535
if (!called_scope) {

‎Zend/zend_compile.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ uint32_t zend_get_class_fetch_type(const zend_string *name) /* {{{ */
16171617
return ZEND_FETCH_CLASS_SELF;
16181618
} else if (zend_string_equals_literal_ci(name, "parent")) {
16191619
return ZEND_FETCH_CLASS_PARENT;
1620-
} else if (zend_string_equals_literal_ci(name, "static")) {
1620+
} else if (zend_string_equals_ci(name, ZSTR_KNOWN(ZEND_STR_STATIC))) {
16211621
return ZEND_FETCH_CLASS_STATIC;
16221622
} else {
16231623
return ZEND_FETCH_CLASS_DEFAULT;
@@ -2821,7 +2821,7 @@ static bool is_this_fetch(zend_ast *ast) /* {{{ */
28212821
{
28222822
if (ast->kind == ZEND_AST_VAR && ast->child[0]->kind == ZEND_AST_ZVAL) {
28232823
zval *name = zend_ast_get_zval(ast->child[0]);
2824-
return Z_TYPE_P(name) == IS_STRING && zend_string_equals_literal(Z_STR_P(name), "this");
2824+
return Z_TYPE_P(name) == IS_STRING && zend_string_equals(Z_STR_P(name), ZSTR_KNOWN(ZEND_STR_THIS));
28252825
}
28262826

28272827
return 0;
@@ -4872,7 +4872,7 @@ static void zend_compile_static_var_common(zend_string *var_name, zval *value, u
48724872

48734873
value = zend_hash_update(CG(active_op_array)->static_variables, var_name, value);
48744874

4875-
if (zend_string_equals_literal(var_name, "this")) {
4875+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
48764876
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as static variable");
48774877
}
48784878

@@ -4888,7 +4888,7 @@ static void zend_compile_static_var(zend_ast *ast) /* {{{ */
48884888
zend_ast *var_ast = ast->child[0];
48894889
zend_string *var_name = zend_ast_get_str(var_ast);
48904890

4891-
if (zend_string_equals_literal(var_name, "this")) {
4891+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
48924892
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as static variable");
48934893
}
48944894

@@ -6089,7 +6089,7 @@ static void zend_compile_try(zend_ast *ast) /* {{{ */
60896089
zend_resolve_class_name_ast(class_ast));
60906090
opline->extended_value = zend_alloc_cache_slot();
60916091

6092-
if (var_name && zend_string_equals_literal(var_name, "this")) {
6092+
if (var_name && zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
60936093
zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this");
60946094
}
60956095

@@ -6925,7 +6925,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
69256925
if (EX_VAR_TO_NUM(var_node.u.op.var) != i) {
69266926
zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter $%s",
69276927
ZSTR_VAL(name));
6928-
} else if (zend_string_equals_literal(name, "this")) {
6928+
} else if (zend_string_equals(name, ZSTR_KNOWN(ZEND_STR_THIS))) {
69296929
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as parameter");
69306930
}
69316931

@@ -7152,7 +7152,7 @@ static void zend_compile_closure_binding(znode *closure, zend_op_array *op_array
71527152
zend_op *opline;
71537153
zval *value;
71547154

7155-
if (zend_string_equals_literal(var_name, "this")) {
7155+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
71567156
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as lexical variable");
71577157
}
71587158

@@ -7196,7 +7196,7 @@ static void find_implicit_binds_recursively(closure_info *info, zend_ast *ast) {
71967196
return;
71977197
}
71987198

7199-
if (zend_string_equals_literal(name, "this")) {
7199+
if (zend_string_equals(name, ZSTR_KNOWN(ZEND_STR_THIS))) {
72007200
/* $this does not need to be explicitly imported. */
72017201
return;
72027202
}

‎Zend/zend_constants.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ ZEND_API zval *zend_get_class_constant_ex(zend_string *class_name, zend_string *
314314
} else {
315315
ce = scope->parent;
316316
}
317-
} else if (zend_string_equals_literal_ci(class_name, "static")) {
317+
} else if (zend_string_equals_ci(class_name, ZSTR_KNOWN(ZEND_STR_STATIC))) {
318318
ce = zend_get_called_scope(EG(current_execute_data));
319319
if (UNEXPECTED(!ce)) {
320320
zend_throw_error(NULL, "Cannot access \"static\" when no class scope is active");
@@ -419,7 +419,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope,
419419
} else {
420420
ce = scope->parent;
421421
}
422-
} else if (zend_string_equals_literal_ci(class_name, "static")) {
422+
} else if (zend_string_equals_ci(class_name, ZSTR_KNOWN(ZEND_STR_STATIC))) {
423423
ce = zend_get_called_scope(EG(current_execute_data));
424424
if (UNEXPECTED(!ce)) {
425425
zend_throw_error(NULL, "Cannot access \"static\" when no class scope is active");

‎ext/reflection/php_reflection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ ZEND_METHOD(Reflection, getModifierNames)
15601560
}
15611561

15621562
if (modifiers & ZEND_ACC_STATIC) {
1563-
add_next_index_stringl(return_value, "static", sizeof("static")-1);
1563+
add_next_index_str(return_value, ZSTR_KNOWN(ZEND_STR_STATIC));
15641564
}
15651565

15661566
if (modifiers & (ZEND_ACC_READONLY | ZEND_ACC_READONLY_CLASS)) {

‎ext/standard/array.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ static zend_long php_extract_ref_if_exists(zend_array *arr, zend_array *symbol_t
17771777
if (zend_string_equals_literal(var_name, "GLOBALS")) {
17781778
continue;
17791779
}
1780-
if (zend_string_equals_literal(var_name, "this")) {
1780+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
17811781
zend_throw_error(NULL, "Cannot re-assign $this");
17821782
return -1;
17831783
}
@@ -1823,7 +1823,7 @@ static zend_long php_extract_if_exists(zend_array *arr, zend_array *symbol_table
18231823
if (zend_string_equals_literal(var_name, "GLOBALS")) {
18241824
continue;
18251825
}
1826-
if (zend_string_equals_literal(var_name, "this")) {
1826+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
18271827
zend_throw_error(NULL, "Cannot re-assign $this");
18281828
return -1;
18291829
}
@@ -1856,7 +1856,7 @@ static zend_long php_extract_ref_overwrite(zend_array *arr, zend_array *symbol_t
18561856
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
18571857
continue;
18581858
}
1859-
if (zend_string_equals_literal(var_name, "this")) {
1859+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
18601860
zend_throw_error(NULL, "Cannot re-assign $this");
18611861
return -1;
18621862
}
@@ -1906,7 +1906,7 @@ static zend_long php_extract_overwrite(zend_array *arr, zend_array *symbol_table
19061906
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
19071907
continue;
19081908
}
1909-
if (zend_string_equals_literal(var_name, "this")) {
1909+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
19101910
zend_throw_error(NULL, "Cannot re-assign $this");
19111911
return -1;
19121912
}
@@ -1965,7 +1965,7 @@ static zend_long php_extract_ref_prefix_if_exists(zend_array *arr, zend_array *s
19651965
}
19661966
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
19671967
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
1968-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
1968+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
19691969
zend_throw_error(NULL, "Cannot re-assign $this");
19701970
return -1;
19711971
} else {
@@ -2019,7 +2019,7 @@ static zend_long php_extract_prefix_if_exists(zend_array *arr, zend_array *symbo
20192019
}
20202020
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
20212021
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
2022-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2022+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
20232023
zend_throw_error(NULL, "Cannot re-assign $this");
20242024
return -1;
20252025
} else {
@@ -2082,7 +2082,7 @@ static zend_long php_extract_ref_prefix_same(zend_array *arr, zend_array *symbol
20822082
prefix:
20832083
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
20842084
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
2085-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2085+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
20862086
zend_throw_error(NULL, "Cannot re-assign $this");
20872087
return -1;
20882088
} else {
@@ -2108,7 +2108,7 @@ static zend_long php_extract_ref_prefix_same(zend_array *arr, zend_array *symbol
21082108
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
21092109
continue;
21102110
}
2111-
if (zend_string_equals_literal(var_name, "this")) {
2111+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
21122112
goto prefix;
21132113
}
21142114
if (Z_ISREF_P(entry)) {
@@ -2154,7 +2154,7 @@ static zend_long php_extract_prefix_same(zend_array *arr, zend_array *symbol_tab
21542154
prefix:
21552155
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
21562156
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
2157-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2157+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
21582158
zend_throw_error(NULL, "Cannot re-assign $this");
21592159
return -1;
21602160
} else {
@@ -2180,7 +2180,7 @@ static zend_long php_extract_prefix_same(zend_array *arr, zend_array *symbol_tab
21802180
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
21812181
continue;
21822182
}
2183-
if (zend_string_equals_literal(var_name, "this")) {
2183+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
21842184
goto prefix;
21852185
}
21862186
ZVAL_DEREF(entry);
@@ -2213,7 +2213,7 @@ static zend_long php_extract_ref_prefix_all(zend_array *arr, zend_array *symbol_
22132213
zend_string_release_ex(str, 0);
22142214
}
22152215
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
2216-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2216+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
22172217
zend_throw_error(NULL, "Cannot re-assign $this");
22182218
return -1;
22192219
} else {
@@ -2260,7 +2260,7 @@ static zend_long php_extract_prefix_all(zend_array *arr, zend_array *symbol_tabl
22602260
zend_string_release_ex(str, 0);
22612261
}
22622262
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
2263-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2263+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
22642264
zend_throw_error(NULL, "Cannot re-assign $this");
22652265
return -1;
22662266
} else {
@@ -2298,7 +2298,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
22982298
ZEND_HASH_FOREACH_KEY_VAL(arr, num_key, var_name, entry) {
22992299
if (var_name) {
23002300
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))
2301-
|| zend_string_equals_literal(var_name, "this")) {
2301+
|| zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
23022302
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
23032303
if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
23042304
zval_ptr_dtor_str(&final_name);
@@ -2316,7 +2316,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
23162316
continue;
23172317
}
23182318
}
2319-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2319+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
23202320
zend_throw_error(NULL, "Cannot re-assign $this");
23212321
return -1;
23222322
} else {
@@ -2353,7 +2353,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
23532353
ZEND_HASH_FOREACH_KEY_VAL(arr, num_key, var_name, entry) {
23542354
if (var_name) {
23552355
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))
2356-
|| zend_string_equals_literal(var_name, "this")) {
2356+
|| zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
23572357
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
23582358
if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
23592359
zval_ptr_dtor_str(&final_name);
@@ -2371,7 +2371,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
23712371
continue;
23722372
}
23732373
}
2374-
if (zend_string_equals_literal(Z_STR(final_name), "this")) {
2374+
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
23752375
zend_throw_error(NULL, "Cannot re-assign $this");
23762376
return -1;
23772377
} else {
@@ -2414,7 +2414,7 @@ static zend_long php_extract_ref_skip(zend_array *arr, zend_array *symbol_table)
24142414
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
24152415
continue;
24162416
}
2417-
if (zend_string_equals_literal(var_name, "this")) {
2417+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
24182418
continue;
24192419
}
24202420
orig_var = zend_hash_find_known_hash(symbol_table, var_name);
@@ -2462,7 +2462,7 @@ static zend_long php_extract_skip(zend_array *arr, zend_array *symbol_table) /*
24622462
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
24632463
continue;
24642464
}
2465-
if (zend_string_equals_literal(var_name, "this")) {
2465+
if (zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
24662466
continue;
24672467
}
24682468
orig_var = zend_hash_find_known_hash(symbol_table, var_name);
@@ -2601,7 +2601,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu
26012601
ZVAL_DEREF(value_ptr);
26022602
Z_TRY_ADDREF_P(value_ptr);
26032603
zend_hash_update(Z_ARRVAL_P(return_value), Z_STR_P(entry), value_ptr);
2604-
} else if (zend_string_equals_literal(Z_STR_P(entry), "this")) {
2604+
} else if (zend_string_equals(Z_STR_P(entry), ZSTR_KNOWN(ZEND_STR_THIS))) {
26052605
zend_object *object = zend_get_this_object(EG(current_execute_data));
26062606
if (object) {
26072607
ZVAL_OBJ_COPY(&data, object);

‎sapi/fpm/fpm/fpm_conf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static char *fpm_conf_set_pm(zval *value, void **config, intptr_t offset) /* {{{
534534
{
535535
zend_string *val = Z_STR_P(value);
536536
struct fpm_worker_pool_config_s *c = *config;
537-
if (zend_string_equals_literal_ci(val, "static")) {
537+
if (zend_string_equals_ci(val, ZSTR_KNOWN(ZEND_STR_STATIC))) {
538538
c->pm = PM_STYLE_STATIC;
539539
} else if (zend_string_equals_literal_ci(val, "dynamic")) {
540540
c->pm = PM_STYLE_DYNAMIC;

‎sapi/phpdbg/phpdbg_watch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ static int phpdbg_watchpoint_parse_symtables(char *input, size_t len, int (*call
13651365
int ret;
13661366

13671367
if (scope && len >= 5 && !memcmp("$this", input, 5)) {
1368-
zend_hash_str_add(EG(current_execute_data)->symbol_table, ZEND_STRL("this"), &EG(current_execute_data)->This);
1368+
zend_hash_add(EG(current_execute_data)->symbol_table, ZSTR_KNOWN(ZEND_STR_THIS), &EG(current_execute_data)->This);
13691369
}
13701370

13711371
if (callback == phpdbg_create_array_watchpoint) {

0 commit comments

Comments
 (0)