archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed preloading of classes linked with traits

Browse source
This commit is contained in:
Dmitry Stogov 2018-10-31 00:50:21 +03:00
parent 68c4f99e23
commit 4a57b5d563
5 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_compile.h
View file

@ -260,7 +260,7 @@ typedef struct _zend_oparray_context {
/* User class has methods with static variables | | | */ /* User class has methods with static variables | | | */
#define ZEND_HAS_STATIC_IN_METHODS (1 << 15) /* X | | | */ #define ZEND_HAS_STATIC_IN_METHODS (1 << 15) /* X | | | */
/* | | | */ /* | | | */
/* Function Flags (unused: 26...30) | | | */ /* Function Flags (unused: 27...30) | | | */
/* ============== | | | */ /* ============== | | | */
/* | | | */ /* | | | */
/* deprecation flag | | | */ /* deprecation flag | | | */
@ -310,6 +310,9 @@ typedef struct _zend_oparray_context {
/* internal function is allocated at arena (int only) | | | */ /* internal function is allocated at arena (int only) | | | */
#define ZEND_ACC_ARENA_ALLOCATED (1 << 25) /* | X | | */ #define ZEND_ACC_ARENA_ALLOCATED (1 << 25) /* | X | | */
/* | | | */ /* | | | */
/* op_array is a clone of trait method | | | */
#define ZEND_ACC_TRAIT_CLONE (1 << 26) /* | X | | */
/* | | | */
/* op_array uses strict mode types | | | */ /* op_array uses strict mode types | | | */
#define ZEND_ACC_STRICT_TYPES (1 << 31) /* | X | | */ #define ZEND_ACC_STRICT_TYPES (1 << 31) /* | X | | */

1
Zend/zend_inheritance.c
View file

@ -1308,6 +1308,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
} else { } else {
new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array)); new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
memcpy(new_fn, fn, sizeof(zend_op_array)); memcpy(new_fn, fn, sizeof(zend_op_array));
new_fn->op_array.fn_flags |= ZEND_ACC_TRAIT_CLONE;
new_fn->op_array.fn_flags &= ~ZEND_ACC_IMMUTABLE; new_fn->op_array.fn_flags &= ~ZEND_ACC_IMMUTABLE;
} }
function_add_ref(new_fn); function_add_ref(new_fn);

2
ext/opcache/Optimizer/zend_call_graph.c
View file

@ -67,7 +67,7 @@ static int zend_foreach_op_array(zend_call_graph *call_graph, zend_script *scrip
ZEND_HASH_FOREACH_PTR(&script->class_table, ce) { ZEND_HASH_FOREACH_PTR(&script->class_table, ce) {
ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) { ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) {
if (op_array->scope == ce) { if (op_array->scope == ce && !(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
if (func(call_graph, op_array) != SUCCESS) { if (func(call_graph, op_array) != SUCCESS) {
return FAILURE; return FAILURE;
} }

6
ext/opcache/Optimizer/zend_optimizer.c
View file

@ -1442,7 +1442,7 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
ZEND_HASH_FOREACH_PTR(&script->class_table, ce) { ZEND_HASH_FOREACH_PTR(&script->class_table, ce) {
ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, name, op_array) { ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, name, op_array) {
if (op_array->scope == ce) { if (op_array->scope == ce && !(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
zend_optimize_op_array(op_array, &ctx); zend_optimize_op_array(op_array, &ctx);
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
@ -1546,7 +1546,7 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
ZEND_HASH_FOREACH_PTR(&script->class_table, ce) { ZEND_HASH_FOREACH_PTR(&script->class_table, ce) {
ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, name, op_array) { ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, name, op_array) {
if (op_array->scope == ce) { if (op_array->scope == ce && !(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
zend_adjust_fcall_stack_size(op_array, &ctx); zend_adjust_fcall_stack_size(op_array, &ctx);
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
@ -1582,7 +1582,7 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
ZEND_HASH_FOREACH_PTR(&script->class_table, ce) { ZEND_HASH_FOREACH_PTR(&script->class_table, ce) {
ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, name, op_array) { ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, name, op_array) {
if (op_array->scope == ce) { if (op_array->scope == ce && !(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
zend_dump_op_array(op_array, ZEND_DUMP_RT_CONSTANTS, "after optimizer", NULL); zend_dump_op_array(op_array, ZEND_DUMP_RT_CONSTANTS, "after optimizer", NULL);
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();

39
ext/opcache/ZendAccelerator.c
View file

@ -3534,9 +3534,44 @@ static void preload_remove_empty_includes(void)
static int preload_optimize(zend_persistent_script *script) static int preload_optimize(zend_persistent_script *script)
{ {
zend_class_entry *ce;
zend_op_array *op_array;
zend_shared_alloc_init_xlat_table();
ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {
if (ce->ce_flags & ZEND_ACC_TRAIT) {
ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) {
if (!(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
zend_shared_alloc_register_xlat_entry(op_array->opcodes, op_array);
}
} ZEND_HASH_FOREACH_END();
}
} ZEND_HASH_FOREACH_END();
if (!zend_optimize_script(&script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level)) { if (!zend_optimize_script(&script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level)) {
return FAILURE; return FAILURE;
} }
ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {
if (ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS) {
ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) {
if (op_array->fn_flags & ZEND_ACC_TRAIT_CLONE) {
zend_op_array *orig_op_array = zend_shared_alloc_get_xlat_entry(op_array->opcodes);
uint32_t fn_flags = op_array->fn_flags;
zend_function *prototype = op_array->prototype;
HashTable *ht = op_array->static_variables;
*op_array = *orig_op_array;
op_array->fn_flags = fn_flags;
op_array->prototype = prototype;
op_array->static_variables = ht;
}
} ZEND_HASH_FOREACH_END();
}
} ZEND_HASH_FOREACH_END();
zend_shared_alloc_destroy_xlat_table();
ZEND_HASH_FOREACH_PTR(preload_scripts, script) { ZEND_HASH_FOREACH_PTR(preload_scripts, script) {
if (!zend_optimize_script(&script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level)) { if (!zend_optimize_script(&script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level)) {
return FAILURE; return FAILURE;
@ -3729,8 +3764,6 @@ static int accel_preload(const char *config)
script->ping_auto_globals_mask = zend_accel_get_auto_globals_no_jit(); script->ping_auto_globals_mask = zend_accel_get_auto_globals_no_jit();
} }
zend_shared_alloc_init_xlat_table();
/* Store all functions and classes in a single pseudo-file */ /* Store all functions and classes in a single pseudo-file */
filename = zend_string_init("$PRELOAD$", strlen("$PRELOAD$"), 0); filename = zend_string_init("$PRELOAD$", strlen("$PRELOAD$"), 0);
#if ZEND_USE_ABS_CONST_ADDR #if ZEND_USE_ABS_CONST_ADDR
@ -3767,6 +3800,8 @@ static int accel_preload(const char *config)
return FAILURE; return FAILURE;
} }
zend_shared_alloc_init_xlat_table();
HANDLE_BLOCK_INTERRUPTIONS(); HANDLE_BLOCK_INTERRUPTIONS();
SHM_UNPROTECT(); SHM_UNPROTECT();