mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't intern compiled_filename

Browse Source 
For php-ast interning the file name is an effective memory leak,
see php-ast#134.

I don't think there's any reason to do this. At some point this
was needed due to bugs in the interned string mechanism that
caused issues if the string was later interned, e.g. through a
__FILE__ reference. These issues have since been resolved.

In conjunction with the filenames_table removal in c4016ecd44
this means that filenames now need to be refcounted like normal
strings. In particular the filename reference in op_arrays and CEs
are refcounted.
This commit is contained in:
Nikita Popov 2020-09-03 11:56:55 +02:00
parent c4016ecd44
commit 7620ea1580
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zend/zend_compile.c
View File

@ -442,14 +442,17 @@ void shutdown_compiler(void) /* {{{ */
ZEND_API zend_string *zend_set_compiled_filename(zend_string *new_compiled_filename) /* {{{ */
{
new_compiled_filename = zend_new_interned_string(zend_string_copy(new_compiled_filename));
CG(compiled_filename) = new_compiled_filename;
CG(compiled_filename) = zend_string_copy(new_compiled_filename);
return new_compiled_filename;
}
/* }}} */
ZEND_API void zend_restore_compiled_filename(zend_string *original_compiled_filename) /* {{{ */
{
if (CG(compiled_filename)) {
zend_string_release(CG(compiled_filename));
CG(compiled_filename) = NULL;
}
CG(compiled_filename) = original_compiled_filename;
}
/* }}} */
@ -7345,7 +7348,7 @@ void zend_compile_class_decl(znode *result, zend_ast *ast, zend_bool toplevel) /
}
ce->ce_flags |= decl->flags;
ce->info.user.filename = zend_get_compiled_filename();
ce->info.user.filename = zend_string_copy(zend_get_compiled_filename());
ce->info.user.line_start = decl->start_lineno;
ce->info.user.line_end = decl->end_lineno;

3
Zend/zend_language_scanner.l
View File

@ -233,8 +233,9 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state)
lex_state->in = SCNG(yy_in);
lex_state->yy_state = YYSTATE;
lex_state->filename = zend_get_compiled_filename();
lex_state->filename = CG(compiled_filename);
lex_state->lineno = CG(zend_lineno);
CG(compiled_filename) = NULL;
lex_state->script_org = SCNG(script_org);
lex_state->script_org_size = SCNG(script_org_size);

4
Zend/zend_opcode.c
View File

@ -61,7 +61,7 @@ void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_siz
op_array->T = 0;
op_array->function_name = NULL;
op_array->filename = zend_get_compiled_filename();
op_array->filename = zend_string_copy(zend_get_compiled_filename());
op_array->doc_comment = NULL;
op_array->attributes = NULL;
@ -354,6 +354,7 @@ ZEND_API void destroy_zend_class(zval *zv)
}
efree(ce->interfaces);
}
zend_string_release_ex(ce->info.user.filename, 0);
if (ce->info.user.doc_comment) {
zend_string_release_ex(ce->info.user.doc_comment, 0);
}
@ -496,6 +497,7 @@ ZEND_API void destroy_op_array(zend_op_array *op_array)
}
efree(op_array->opcodes);
zend_string_release_ex(op_array->filename, 0);
if (op_array->doc_comment) {
zend_string_release_ex(op_array->doc_comment, 0);
}

9
ext/opcache/ZendAccelerator.c
View File

@ -4528,7 +4528,6 @@ static int accel_preload(const char *config, zend_bool in_child)
if (ret == SUCCESS) {
zend_persistent_script *script;
zend_string *filename;
int ping_auto_globals_mask;
int i;
zend_class_entry *ce;
@ -4668,7 +4667,7 @@ static int accel_preload(const char *config, zend_bool in_child)
script->ping_auto_globals_mask = ping_auto_globals_mask;
/* Store all functions and classes in a single pseudo-file */
filename = zend_string_init("$PRELOAD$", sizeof("$PRELOAD$") - 1, 0);
CG(compiled_filename) = zend_string_init("$PRELOAD$", sizeof("$PRELOAD$") - 1, 0);
#if ZEND_USE_ABS_CONST_ADDR
init_op_array(&script->script.main_op_array, ZEND_USER_FUNCTION, 1);
#else
@ -4690,8 +4689,8 @@ static int accel_preload(const char *config, zend_bool in_child)
ZEND_PASS_TWO_UPDATE_CONSTANT(&script->script.main_op_array, script->script.main_op_array.opcodes, script->script.main_op_array.opcodes[0].op1);
zend_vm_set_opcode_handler(script->script.main_op_array.opcodes);
script->script.main_op_array.filename = filename;
script->script.filename = zend_string_copy(filename);
script->script.filename = CG(compiled_filename);
CG(compiled_filename) = NULL;
script->script.first_early_binding_opline = (uint32_t)-1;
@ -4728,8 +4727,6 @@ static int accel_preload(const char *config, zend_bool in_child)
SHM_PROTECT();
HANDLE_UNBLOCK_INTERRUPTIONS();
zend_string_release(filename);
ZEND_ASSERT(ZCSG(preload_script)->arena_size == 0);
preload_load();

6
ext/opcache/zend_persist.c
View File

@ -565,8 +565,7 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
}
if (op_array->filename) {
/* do not free! PHP has centralized filename storage, compiler will free it */
zend_accel_memdup_string(op_array->filename);
zend_accel_store_string(op_array->filename);
}
if (op_array->arg_info) {
@ -864,8 +863,7 @@ static void zend_persist_class_entry(zval *zv)
HT_FLAGS(&ce->constants_table) &= (HASH_FLAG_UNINITIALIZED | HASH_FLAG_STATIC_KEYS);
if (ce->info.user.filename) {
/* do not free! PHP has centralized filename storage, compiler will free it */
zend_accel_memdup_string(ce->info.user.filename);
zend_accel_store_string(ce->info.user.filename);
}
if (ce->info.user.doc_comment) {
if (ZCG(accel_directives).save_comments) {