Skip to content

Commit c19977d

Browse files
nikicnikic
committed
Fix delayed early binding with optimization
It's possible for delayed early binding opcodes to get optimized away if they are "unreachable". However, we still need to attempt early binding for them. (In some cases we also corrupt the early binding list outright during optimization, which is how I got here.) Fix this by storing information about delayed early binding independently of DECLARE_CLASS_DELAYED opcodes, so early binding is performed even after the opcode has been dropped.
1 parent fb296cf commit c19977d

17 files changed

+212
-115
lines changed

‎Zend/Optimizer/block_pass.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,13 +1119,6 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
11191119
free_alloca(map, use_heap);
11201120
}
11211121

1122-
/* adjust early binding list */
1123-
if (op_array->fn_flags & ZEND_ACC_EARLY_BINDING) {
1124-
ZEND_ASSERT(op_array == &ctx->script->main_op_array);
1125-
ctx->script->first_early_binding_opline =
1126-
zend_build_delayed_early_binding_list(op_array);
1127-
}
1128-
11291122
/* rebuild map (just for printing) */
11301123
memset(cfg->map, -1, sizeof(int) * op_array->last);
11311124
for (int n = 0; n < cfg->blocks_count; n++) {

‎Zend/Optimizer/dfa_pass.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,6 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa, zend_op
235235
}
236236
}
237237

238-
/* update early binding list */
239-
if (op_array->fn_flags & ZEND_ACC_EARLY_BINDING) {
240-
uint32_t *opline_num = &ctx->script->first_early_binding_opline;
241-
242-
ZEND_ASSERT(op_array == &ctx->script->main_op_array);
243-
do {
244-
*opline_num -= shiftlist[*opline_num];
245-
opline_num = &op_array->opcodes[*opline_num].result.opline_num;
246-
} while (*opline_num != (uint32_t)-1);
247-
}
248-
249238
/* update call graph */
250239
if (func_info) {
251240
zend_call_info *call_info = func_info->callee_info;

‎Zend/Optimizer/nop_removal.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,6 @@ void zend_optimizer_nop_removal(zend_op_array *op_array, zend_optimizer_ctx *ctx
8989
op_array->try_catch_array[j].finally_end -= shiftlist[op_array->try_catch_array[j].finally_end];
9090
}
9191
}
92-
93-
/* update early binding list */
94-
if (op_array->fn_flags & ZEND_ACC_EARLY_BINDING) {
95-
uint32_t *opline_num = &ctx->script->first_early_binding_opline;
96-
97-
ZEND_ASSERT(op_array == &ctx->script->main_op_array);
98-
do {
99-
*opline_num -= shiftlist[*opline_num];
100-
opline_num = &op_array->opcodes[*opline_num].result.opline_num;
101-
} while (*opline_num != (uint32_t)-1);
102-
}
10392
}
10493
free_alloca(shiftlist, use_heap);
10594
}

‎Zend/Optimizer/zend_optimizer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ typedef struct _zend_script {
8686
zend_op_array main_op_array;
8787
HashTable function_table;
8888
HashTable class_table;
89-
uint32_t first_early_binding_opline; /* the linked list of delayed declarations */
9089
} zend_script;
9190

9291
typedef void (*zend_optimizer_pass_t)(zend_script *, void *context);

‎Zend/tests/early_binding_unreachable.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?php
2+
var_dump(new B);
3+
if (true) {
4+
return;
5+
}
6+
class B extends A {}

‎Zend/tests/early_binding_unreachable.phpt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--TEST--
2+
Early bound class in otherwise unreachable code
3+
--FILE--
4+
<?php
5+
class A {}
6+
require __DIR__ . '/early_binding_unreachable.inc';
7+
?>
8+
--EXPECT--
9+
object(B)#1 (0) {
10+
}

‎Zend/zend_compile.c

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,73 +1322,6 @@ static void zend_mark_function_as_generator(void) /* {{{ */
13221322
}
13231323
/* }}} */
13241324

1325-
ZEND_API uint32_t zend_build_delayed_early_binding_list(const zend_op_array *op_array) /* {{{ */
1326-
{
1327-
if (op_array->fn_flags & ZEND_ACC_EARLY_BINDING) {
1328-
uint32_t first_early_binding_opline = (uint32_t)-1;
1329-
uint32_t *prev_opline_num = &first_early_binding_opline;
1330-
zend_op *opline = op_array->opcodes;
1331-
zend_op *end = opline + op_array->last;
1332-
1333-
while (opline < end) {
1334-
if (opline->opcode == ZEND_DECLARE_CLASS_DELAYED) {
1335-
*prev_opline_num = opline - op_array->opcodes;
1336-
prev_opline_num = &opline->result.opline_num;
1337-
}
1338-
++opline;
1339-
}
1340-
*prev_opline_num = -1;
1341-
return first_early_binding_opline;
1342-
}
1343-
return (uint32_t)-1;
1344-
}
1345-
/* }}} */
1346-
1347-
ZEND_API void zend_do_delayed_early_binding(zend_op_array *op_array, uint32_t first_early_binding_opline) /* {{{ */
1348-
{
1349-
if (first_early_binding_opline != (uint32_t)-1) {
1350-
bool orig_in_compilation = CG(in_compilation);
1351-
uint32_t opline_num = first_early_binding_opline;
1352-
void **run_time_cache;
1353-
1354-
if (!ZEND_MAP_PTR(op_array->run_time_cache)) {
1355-
void *ptr;
1356-
1357-
ZEND_ASSERT(op_array->fn_flags & ZEND_ACC_HEAP_RT_CACHE);
1358-
ptr = emalloc(op_array->cache_size + sizeof(void*));
1359-
ZEND_MAP_PTR_INIT(op_array->run_time_cache, ptr);
1360-
ptr = (char*)ptr + sizeof(void*);
1361-
ZEND_MAP_PTR_SET(op_array->run_time_cache, ptr);
1362-
memset(ptr, 0, op_array->cache_size);
1363-
}
1364-
run_time_cache = RUN_TIME_CACHE(op_array);
1365-
1366-
CG(in_compilation) = 1;
1367-
while (opline_num != (uint32_t)-1) {
1368-
const zend_op *opline = &op_array->opcodes[opline_num];
1369-
zval *lcname = RT_CONSTANT(opline, opline->op1);
1370-
zval *zv = zend_hash_find_known_hash(EG(class_table), Z_STR_P(lcname + 1));
1371-
1372-
if (zv) {
1373-
zend_class_entry *ce = Z_CE_P(zv);
1374-
zend_string *lc_parent_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
1375-
zend_class_entry *parent_ce = zend_hash_find_ex_ptr(EG(class_table), lc_parent_name, 1);
1376-
1377-
if (parent_ce) {
1378-
ce = zend_try_early_bind(ce, parent_ce, Z_STR_P(lcname), zv);
1379-
if (ce) {
1380-
/* Store in run-time cache */
1381-
((void**)((char*)run_time_cache + opline->extended_value))[0] = ce;
1382-
}
1383-
}
1384-
}
1385-
opline_num = op_array->opcodes[opline_num].result.opline_num;
1386-
}
1387-
CG(in_compilation) = orig_in_compilation;
1388-
}
1389-
}
1390-
/* }}} */
1391-
13921325
ZEND_API zend_string *zend_mangle_property_name(const char *src1, size_t src1_length, const char *src2, size_t src2_length, bool internal) /* {{{ */
13931326
{
13941327
size_t prop_name_length = 1 + src1_length + 1 + src2_length;

‎Zend/zend_compile.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,6 @@ ZEND_API zend_class_entry *zend_bind_class_in_slot(
791791
zval *class_table_slot, zval *lcname, zend_string *lc_parent_name);
792792
ZEND_API zend_result do_bind_function(zend_function *func, zval *lcname);
793793
ZEND_API zend_result do_bind_class(zval *lcname, zend_string *lc_parent_name);
794-
ZEND_API uint32_t zend_build_delayed_early_binding_list(const zend_op_array *op_array);
795-
ZEND_API void zend_do_delayed_early_binding(zend_op_array *op_array, uint32_t first_early_binding_opline);
796794

797795
void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline);
798796

‎Zend/zend_inheritance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3029,7 +3029,7 @@ static zend_always_inline bool register_early_bound_ce(zval *delayed_early_bindi
30293029
return zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL;
30303030
}
30313031

3032-
zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *parent_ce, zend_string *lcname, zval *delayed_early_binding) /* {{{ */
3032+
ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *parent_ce, zend_string *lcname, zval *delayed_early_binding) /* {{{ */
30333033
{
30343034
inheritance_status status;
30353035
zend_class_entry *proto = NULL;

‎Zend/zend_inheritance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
3434

3535
void zend_verify_abstract_class(zend_class_entry *ce);
3636
void zend_build_properties_info_table(zend_class_entry *ce);
37-
zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *parent_ce, zend_string *lcname, zval *delayed_early_binding);
37+
ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *parent_ce, zend_string *lcname, zval *delayed_early_binding);
3838

3939
ZEND_API extern zend_class_entry* (*zend_inheritance_cache_get)(zend_class_entry *ce, zend_class_entry *parent, zend_class_entry **traits_and_interfaces);
4040
ZEND_API extern zend_class_entry* (*zend_inheritance_cache_add)(zend_class_entry *ce, zend_class_entry *proto, zend_class_entry *parent, zend_class_entry **traits_and_interfaces, HashTable *dependencies);

‎ext/opcache/ZendAccelerator.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,7 @@ static zend_persistent_script *cache_script_in_file_cache(zend_persistent_script
14711471
orig_compiler_options = CG(compiler_options);
14721472
CG(compiler_options) |= ZEND_COMPILE_WITH_FILE_CACHE;
14731473
zend_optimize_script(&new_persistent_script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level);
1474+
zend_accel_finalize_delayed_early_binding_list(new_persistent_script);
14741475
CG(compiler_options) = orig_compiler_options;
14751476

14761477
*from_shared_memory = 1;
@@ -1488,6 +1489,7 @@ static zend_persistent_script *cache_script_in_shared_memory(zend_persistent_scr
14881489
CG(compiler_options) |= ZEND_COMPILE_WITH_FILE_CACHE;
14891490
}
14901491
zend_optimize_script(&new_persistent_script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level);
1492+
zend_accel_finalize_delayed_early_binding_list(new_persistent_script);
14911493
CG(compiler_options) = orig_compiler_options;
14921494

14931495
/* exclusive lock */
@@ -1810,10 +1812,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
18101812
new_persistent_script->script.main_op_array = *op_array;
18111813
zend_accel_move_user_functions(CG(function_table), CG(function_table)->nNumUsed - orig_functions_count, &new_persistent_script->script);
18121814
zend_accel_move_user_classes(CG(class_table), CG(class_table)->nNumUsed - orig_class_count, &new_persistent_script->script);
1813-
new_persistent_script->script.first_early_binding_opline =
1814-
(op_array->fn_flags & ZEND_ACC_EARLY_BINDING) ?
1815-
zend_build_delayed_early_binding_list(op_array) :
1816-
(uint32_t)-1;
1815+
zend_accel_build_delayed_early_binding_list(new_persistent_script);
18171816
new_persistent_script->num_warnings = EG(num_errors);
18181817
new_persistent_script->warnings = EG(errors);
18191818
EG(num_errors) = 0;
@@ -3604,7 +3603,6 @@ static zend_op_array *preload_compile_file(zend_file_handle *file_handle, int ty
36043603
zend_persistent_script *script;
36053604

36063605
script = create_persistent_script();
3607-
script->script.first_early_binding_opline = (uint32_t)-1;
36083606
script->script.filename = zend_string_copy(op_array->filename);
36093607
zend_string_hash_val(script->script.filename);
36103608
script->script.main_op_array = *op_array;
@@ -4023,8 +4021,9 @@ static void preload_link(void)
40234021
preload_remove_declares(op_array);
40244022

40254023
if (op_array->fn_flags & ZEND_ACC_EARLY_BINDING) {
4026-
script->script.first_early_binding_opline = zend_build_delayed_early_binding_list(op_array);
4027-
if (script->script.first_early_binding_opline == (uint32_t)-1) {
4024+
zend_accel_free_delayed_early_binding_list(script);
4025+
zend_accel_build_delayed_early_binding_list(script);
4026+
if (!script->num_early_bindings) {
40284027
op_array->fn_flags &= ~ZEND_ACC_EARLY_BINDING;
40294028
}
40304029
}
@@ -4195,6 +4194,7 @@ static void preload_optimize(zend_persistent_script *script)
41954194
} ZEND_HASH_FOREACH_END();
41964195

41974196
zend_optimize_script(&script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level);
4197+
zend_accel_finalize_delayed_early_binding_list(script);
41984198

41994199
ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {
42004200
preload_fix_trait_methods(ce);
@@ -4210,6 +4210,7 @@ static void preload_optimize(zend_persistent_script *script)
42104210

42114211
ZEND_HASH_FOREACH_PTR(preload_scripts, script) {
42124212
zend_optimize_script(&script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level);
4213+
zend_accel_finalize_delayed_early_binding_list(script);
42134214
} ZEND_HASH_FOREACH_END();
42144215
}
42154216

@@ -4522,8 +4523,6 @@ static int accel_preload(const char *config, bool in_child)
45224523
script->script.filename = CG(compiled_filename);
45234524
CG(compiled_filename) = NULL;
45244525

4525-
script->script.first_early_binding_opline = (uint32_t)-1;
4526-
45274526
preload_move_user_functions(CG(function_table), &script->script.function_table);
45284527
preload_move_user_classes(CG(class_table), &script->script.class_table);
45294528

‎ext/opcache/ZendAccelerator.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@ typedef enum _zend_accel_restart_reason {
109109
ACCEL_RESTART_USER /* restart scheduled by opcache_reset() */
110110
} zend_accel_restart_reason;
111111

112+
typedef struct _zend_early_binding {
113+
zend_string *lcname;
114+
zend_string *rtd_key;
115+
zend_string *lc_parent_name;
116+
uint32_t cache_slot;
117+
} zend_early_binding;
118+
112119
typedef struct _zend_persistent_script {
113120
zend_script script;
114121
zend_long compiler_halt_offset; /* position of __HALT_COMPILER or -1 */
@@ -118,7 +125,9 @@ typedef struct _zend_persistent_script {
118125
bool is_phar;
119126
bool empty;
120127
uint32_t num_warnings;
128+
uint32_t num_early_bindings;
121129
zend_error_info **warnings;
130+
zend_early_binding *early_bindings;
122131

123132
void *mem; /* shared memory area used by script structures */
124133
size_t size; /* size of used shared memory */

0 commit comments

Comments
 (0)