Skip to content

Commit 923f267

Browse files
iluuu1994iluuu1994
committed
Revert "Revert "Remove name field from the zend_constant struct (php#10954)""
This reverts commit 9f4bd30.
1 parent 8e8a23a commit 923f267

15 files changed

+68
-81
lines changed

‎UPGRADING.INTERNALS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ PHP 8.3 INTERNALS UPGRADE NOTES
4242
* The order of members of zend_op_array, zend_ssa_var, zend_ssa_var_info,
4343
zend_executor_globals and php_core_globals have changed to improve
4444
struct packing which reduces their size.
45+
* The name field have been removed from the zend_constant struct. Now,
46+
constant names are only stored as keys of the global constants table.
47+
That's why the `zend_register_constant()` function now expects the
48+
constant name as its first parameter.
4549
* Many calls to zend_assign_to_variable have been replaced with
4650
zend_assign_to_variable_ex which allows delaying the releasing of the old
4751
variable value. This avoids side-effects through destructors between the

‎Zend/zend_builtin_functions.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,7 @@ ZEND_FUNCTION(define)
511511
register_constant:
512512
/* non persistent */
513513
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
514-
c.name = zend_string_copy(name);
515-
if (zend_register_constant(&c) == SUCCESS) {
514+
if (zend_register_constant(name, &c) == SUCCESS) {
516515
RETURN_TRUE;
517516
} else {
518517
RETURN_FALSE;
@@ -1480,6 +1479,7 @@ ZEND_FUNCTION(get_defined_constants)
14801479
zend_constant *val;
14811480
int module_number;
14821481
zval *modules, const_val;
1482+
zend_string *const_name;
14831483
char **module_names;
14841484
zend_module_entry *module;
14851485
int i = 1;
@@ -1494,12 +1494,7 @@ ZEND_FUNCTION(get_defined_constants)
14941494
} ZEND_HASH_FOREACH_END();
14951495
module_names[i] = "user";
14961496

1497-
ZEND_HASH_MAP_FOREACH_PTR(EG(zend_constants), val) {
1498-
if (!val->name) {
1499-
/* skip special constants */
1500-
continue;
1501-
}
1502-
1497+
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(EG(zend_constants), const_name, val) {
15031498
if (ZEND_CONSTANT_MODULE_NUMBER(val) == PHP_USER_CONSTANT) {
15041499
module_number = i;
15051500
} else if (ZEND_CONSTANT_MODULE_NUMBER(val) > i) {
@@ -1515,22 +1510,19 @@ ZEND_FUNCTION(get_defined_constants)
15151510
}
15161511

15171512
ZVAL_COPY_OR_DUP(&const_val, &val->value);
1518-
zend_hash_add_new(Z_ARRVAL(modules[module_number]), val->name, &const_val);
1513+
zend_hash_add_new(Z_ARRVAL(modules[module_number]), const_name, &const_val);
15191514
} ZEND_HASH_FOREACH_END();
15201515

15211516
efree(module_names);
15221517
efree(modules);
15231518
} else {
15241519
zend_constant *constant;
1520+
zend_string *const_name;
15251521
zval const_val;
15261522

1527-
ZEND_HASH_MAP_FOREACH_PTR(EG(zend_constants), constant) {
1528-
if (!constant->name) {
1529-
/* skip special constants */
1530-
continue;
1531-
}
1523+
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(EG(zend_constants), const_name, constant) {
15321524
ZVAL_COPY_OR_DUP(&const_val, &constant->value);
1533-
zend_hash_add_new(Z_ARRVAL_P(return_value), constant->name, &const_val);
1525+
zend_hash_add_new(Z_ARRVAL_P(return_value), const_name, &const_val);
15341526
} ZEND_HASH_FOREACH_END();
15351527
}
15361528
}

‎Zend/zend_constants.c

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,9 @@ void free_zend_constant(zval *zv)
4343

4444
if (!(ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT)) {
4545
zval_ptr_dtor_nogc(&c->value);
46-
if (c->name) {
47-
zend_string_release_ex(c->name, 0);
48-
}
4946
efree(c);
5047
} else {
5148
zval_internal_ptr_dtor(&c->value);
52-
if (c->name) {
53-
zend_string_release_ex(c->name, 1);
54-
}
5549
free(c);
5650
}
5751
}
@@ -67,7 +61,6 @@ static void copy_zend_constant(zval *zv)
6761
memcpy(Z_PTR_P(zv), c, sizeof(zend_constant));
6862

6963
c = Z_PTR_P(zv);
70-
c->name = zend_string_copy(c->name);
7164
if (Z_TYPE(c->value) == IS_STRING) {
7265
Z_STR(c->value) = zend_string_dup(Z_STR(c->value), 1);
7366
}
@@ -129,8 +122,7 @@ ZEND_API void zend_register_null_constant(const char *name, size_t name_len, int
129122

130123
ZVAL_NULL(&c.value);
131124
ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
132-
c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
133-
zend_register_constant(&c);
125+
zend_register_internal_constant(name, name_len, &c);
134126
}
135127

136128
ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, bool bval, int flags, int module_number)
@@ -139,8 +131,7 @@ ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, boo
139131

140132
ZVAL_BOOL(&c.value, bval);
141133
ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
142-
c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
143-
zend_register_constant(&c);
134+
zend_register_internal_constant(name, name_len, &c);
144135
}
145136

146137
ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zend_long lval, int flags, int module_number)
@@ -149,8 +140,7 @@ ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zen
149140

150141
ZVAL_LONG(&c.value, lval);
151142
ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
152-
c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
153-
zend_register_constant(&c);
143+
zend_register_internal_constant(name, name_len, &c);
154144
}
155145

156146

@@ -160,8 +150,7 @@ ZEND_API void zend_register_double_constant(const char *name, size_t name_len, d
160150

161151
ZVAL_DOUBLE(&c.value, dval);
162152
ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
163-
c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
164-
zend_register_constant(&c);
153+
zend_register_internal_constant(name, name_len, &c);
165154
}
166155

167156

@@ -171,8 +160,7 @@ ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len,
171160

172161
ZVAL_STR(&c.value, zend_string_init_interned(strval, strlen, flags & CONST_PERSISTENT));
173162
ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
174-
c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
175-
zend_register_constant(&c);
163+
zend_register_internal_constant(name, name_len, &c);
176164
}
177165

178166

@@ -545,25 +533,22 @@ static void* zend_hash_add_constant(HashTable *ht, zend_string *key, zend_consta
545533
return ret;
546534
}
547535

548-
ZEND_API zend_result zend_register_constant(zend_constant *c)
536+
ZEND_API zend_result zend_register_constant(zend_string *name, zend_constant *c)
549537
{
550538
zend_string *lowercase_name = NULL;
551-
zend_string *name;
552539
zend_result ret = SUCCESS;
553540
bool persistent = (ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT) != 0;
554541

555542
#if 0
556543
printf("Registering constant for module %d\n", c->module_number);
557544
#endif
558545

559-
const char *slash = strrchr(ZSTR_VAL(c->name), '\\');
546+
const char *slash = strrchr(ZSTR_VAL(name), '\\');
560547
if (slash) {
561-
lowercase_name = zend_string_init(ZSTR_VAL(c->name), ZSTR_LEN(c->name), persistent);
562-
zend_str_tolower(ZSTR_VAL(lowercase_name), slash - ZSTR_VAL(c->name));
548+
lowercase_name = zend_string_init(ZSTR_VAL(name), ZSTR_LEN(name), persistent);
549+
zend_str_tolower(ZSTR_VAL(lowercase_name), slash - ZSTR_VAL(name));
563550
lowercase_name = zend_new_interned_string(lowercase_name);
564551
name = lowercase_name;
565-
} else {
566-
name = c->name;
567552
}
568553

569554
/* Check if the user is trying to define any special constant */
@@ -572,7 +557,6 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
572557
|| zend_hash_add_constant(EG(zend_constants), name, c) == NULL
573558
) {
574559
zend_error(E_WARNING, "Constant %s already defined", ZSTR_VAL(name));
575-
zend_string_release(c->name);
576560
if (!persistent) {
577561
zval_ptr_dtor_nogc(&c->value);
578562
}
@@ -583,3 +567,13 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
583567
}
584568
return ret;
585569
}
570+
571+
ZEND_API zend_result zend_register_internal_constant(const char *name, size_t name_len, zend_constant *c) {
572+
zend_string *name_str = zend_string_init_interned(name, name_len, ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT);
573+
574+
zend_result result = zend_register_constant(name_str, c);
575+
576+
zend_string_release(name_str);
577+
578+
return result;
579+
}

‎Zend/zend_constants.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
typedef struct _zend_constant {
3434
zval value;
35-
zend_string *name;
3635
} zend_constant;
3736

3837
#define ZEND_CONSTANT_FLAGS(c) \
@@ -84,7 +83,8 @@ ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zen
8483
ZEND_API void zend_register_double_constant(const char *name, size_t name_len, double dval, int flags, int module_number);
8584
ZEND_API void zend_register_string_constant(const char *name, size_t name_len, const char *strval, int flags, int module_number);
8685
ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, const char *strval, size_t strlen, int flags, int module_number);
87-
ZEND_API zend_result zend_register_constant(zend_constant *c);
86+
ZEND_API zend_result zend_register_internal_constant(const char *name, size_t name_len, zend_constant *c);
87+
ZEND_API zend_result zend_register_constant(zend_string *name, zend_constant *c);
8888
#ifdef ZTS
8989
void zend_copy_constants(HashTable *target, HashTable *source);
9090
#endif

‎Zend/zend_execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5008,7 +5008,7 @@ static zend_always_inline zend_result _zend_quick_get_constant(
50085008
if (!check_defined_only) {
50095009
ZVAL_COPY_OR_DUP(EX_VAR(opline->result.var), &c->value);
50105010
if (ZEND_CONSTANT_FLAGS(c) & CONST_DEPRECATED) {
5011-
zend_error(E_DEPRECATED, "Constant %s is deprecated", ZSTR_VAL(c->name));
5011+
zend_error(E_DEPRECATED, "Constant %s is deprecated", ZSTR_VAL(Z_STR_P(key)));
50125012
return SUCCESS;
50135013
}
50145014
}

‎Zend/zend_execute_API.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,6 @@ ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)
294294
break;
295295
}
296296
zval_ptr_dtor_nogc(&c->value);
297-
if (c->name) {
298-
zend_string_release_ex(c->name, 0);
299-
}
300297
efree(c);
301298
zend_string_release_ex(key, 0);
302299
} ZEND_HASH_MAP_FOREACH_END_DEL();

‎Zend/zend_vm_def.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8127,9 +8127,8 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
81278127
}
81288128
/* non persistent, case sensitive */
81298129
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
8130-
c.name = zend_string_copy(Z_STR_P(name));
81318130

8132-
if (zend_register_constant(&c) == FAILURE) {
8131+
if (zend_register_constant(Z_STR_P(name), &c) == FAILURE) {
81338132
}
81348133

81358134
FREE_OP1();

‎Zend/zend_vm_execute.h

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/com_dotnet/com_typeinfo.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, in
197197
if (pTKind == TKIND_ENUM) {
198198
ITypeLib_GetTypeInfo(TL, i, &TypeInfo);
199199
for (j = 0; ; j++) {
200-
zend_string *const_name;
200+
zend_string *const_name, *name;
201201

202202
if (FAILED(ITypeInfo_GetVarDesc(TypeInfo, j, &pVarDesc))) {
203203
break;
@@ -228,12 +228,13 @@ PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, in
228228
ZVAL_LONG(&c.value, Z_LVAL(value));
229229
if (mode & CONST_PERSISTENT) {
230230
/* duplicate string in a persistent manner */
231-
c.name = zend_string_dup(const_name, /* persistent */ true);
231+
name = zend_string_dup(const_name, /* persistent */ true);
232232
zend_string_release_ex(const_name, /* persistent */ false);
233233
} else {
234-
c.name = const_name;
234+
name = const_name;
235235
}
236-
zend_register_constant(&c);
236+
zend_register_constant(name, &c);
237+
zend_string_release(name);
237238
}
238239
ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
239240
}

‎ext/opcache/ZendAccelerator.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,9 +735,6 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int
735735
p->key = new_interned_string(p->key);
736736
}
737737
c = (zend_constant*)Z_PTR(p->val);
738-
if (c->name) {
739-
c->name = new_interned_string(c->name);
740-
}
741738
if (Z_TYPE(c->value) == IS_STRING) {
742739
ZVAL_STR(&c->value, new_interned_string(Z_STR(c->value)));
743740
}

‎ext/opcache/jit/zend_jit_vm_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ static zend_always_inline zend_constant* _zend_quick_get_constant(
282282

283283
if (!check_defined_only) {
284284
if (ZEND_CONSTANT_FLAGS(c) & CONST_DEPRECATED) {
285-
zend_error(E_DEPRECATED, "Constant %s is deprecated", ZSTR_VAL(c->name));
285+
zend_error(E_DEPRECATED, "Constant %s is deprecated", ZSTR_VAL(Z_STR_P(key)));
286286
if (EG(exception)) {
287287
return NULL;
288288
}

‎ext/reflection/php_reflection.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,11 +1045,13 @@ static void _extension_string(smart_str *str, zend_module_entry *module, char *i
10451045
{
10461046
smart_str str_constants = {0};
10471047
zend_constant *constant;
1048+
zend_string *name;
10481049
int num_constants = 0;
10491050

1050-
ZEND_HASH_MAP_FOREACH_PTR(EG(zend_constants), constant) {
1051+
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(EG(zend_constants), name, constant) {
1052+
10511053
if (ZEND_CONSTANT_MODULE_NUMBER(constant) == module->module_number) {
1052-
_const_string(&str_constants, ZSTR_VAL(constant->name), &constant->value, indent);
1054+
_const_string(&str_constants, ZSTR_VAL(name), &constant->value, indent);
10531055
num_constants++;
10541056
}
10551057
} ZEND_HASH_FOREACH_END();
@@ -6035,18 +6037,19 @@ ZEND_METHOD(ReflectionExtension, getConstants)
60356037
reflection_object *intern;
60366038
zend_module_entry *module;
60376039
zend_constant *constant;
6040+
zend_string *name;
60386041

60396042
if (zend_parse_parameters_none() == FAILURE) {
60406043
RETURN_THROWS();
60416044
}
60426045
GET_REFLECTION_OBJECT_PTR(module);
60436046

60446047
array_init(return_value);
6045-
ZEND_HASH_MAP_FOREACH_PTR(EG(zend_constants), constant) {
6048+
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(EG(zend_constants), name, constant) {
60466049
if (module->module_number == ZEND_CONSTANT_MODULE_NUMBER(constant)) {
60476050
zval const_val;
60486051
ZVAL_COPY_OR_DUP(&const_val, &constant->value);
6049-
zend_hash_update(Z_ARRVAL_P(return_value), constant->name, &const_val);
6052+
zend_hash_update(Z_ARRVAL_P(return_value), name, &const_val);
60506053
}
60516054
} ZEND_HASH_FOREACH_END();
60526055
}

‎sapi/cli/php_cli.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,16 +558,13 @@ static void cli_register_file_handles(void)
558558
php_stream_to_zval(s_err, &ec.value);
559559

560560
Z_CONSTANT_FLAGS(ic.value) = 0;
561-
ic.name = zend_string_init_interned("STDIN", sizeof("STDIN")-1, 0);
562-
zend_register_constant(&ic);
561+
zend_register_internal_constant("STDIN", sizeof("STDIN")-1, &ic);
563562

564563
Z_CONSTANT_FLAGS(oc.value) = 0;
565-
oc.name = zend_string_init_interned("STDOUT", sizeof("STDOUT")-1, 0);
566-
zend_register_constant(&oc);
564+
zend_register_internal_constant("STDOUT", sizeof("STDOUT")-1, &oc);
567565

568566
Z_CONSTANT_FLAGS(ec.value) = 0;
569-
ec.name = zend_string_init_interned("STDERR", sizeof("STDERR")-1, 0);
570-
zend_register_constant(&ec);
567+
zend_register_internal_constant("STDERR", sizeof("STDERR")-1, &ec);
571568
}
572569

573570
static const char *param_mode_conflict = "Either execute direct code, process stdin or use a file.\n";

‎sapi/phpdbg/phpdbg.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -912,21 +912,24 @@ void phpdbg_register_file_handles(void) /* {{{ */
912912

913913
ic.value = zin;
914914
Z_CONSTANT_FLAGS(ic.value) = 0;
915-
ic.name = zend_string_init(ZEND_STRL("STDIN"), 0);
916-
zend_hash_del(EG(zend_constants), ic.name);
917-
zend_register_constant(&ic);
915+
zend_string *stdin_name = zend_string_init(ZEND_STRL("STDIN"), 0);
916+
zend_hash_del(EG(zend_constants), stdin_name);
917+
zend_register_constant(stdin_name, &ic);
918+
zend_string_release(stdin_name);
918919

919920
oc.value = zout;
920921
Z_CONSTANT_FLAGS(oc.value) = 0;
921-
oc.name = zend_string_init(ZEND_STRL("STDOUT"), 0);
922-
zend_hash_del(EG(zend_constants), oc.name);
923-
zend_register_constant(&oc);
922+
zend_string *stdout_name = zend_string_init(ZEND_STRL("STDOUT"), 0);
923+
zend_hash_del(EG(zend_constants), stdout_name);
924+
zend_register_constant(stdout_name, &oc);
925+
zend_string_release(stdout_name);
924926

925927
ec.value = zerr;
926928
Z_CONSTANT_FLAGS(ec.value) = 0;
927-
ec.name = zend_string_init(ZEND_STRL("STDERR"), 0);
928-
zend_hash_del(EG(zend_constants), ec.name);
929-
zend_register_constant(&ec);
929+
zend_string *stderr_name = zend_string_init(ZEND_STRL("STDERR"), 0);
930+
zend_hash_del(EG(zend_constants), stderr_name);
931+
zend_register_constant(stderr_name, &ec);
932+
zend_string_release(stderr_name);
930933
}
931934
/* }}} */
932935

0 commit comments

Comments
 (0)