Skip to content

Commit 47e4001

Browse files
nikicnikic
committed
Remove more unused func_info fields
1 parent 8ea9e1a commit 47e4001

File tree

5 files changed

+0
-29
lines changed

5 files changed

+0
-29
lines changed

‎ext/opcache/Optimizer/zend_call_graph.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ static void zend_op_array_collect(zend_op_array *op_array, void *context)
4141
ZEND_SET_FUNC_INFO(op_array, func_info);
4242
call_graph->op_arrays[call_graph->op_arrays_count] = op_array;
4343
func_info->num = call_graph->op_arrays_count;
44-
func_info->num_args = -1;
45-
func_info->return_value_used = -1;
4644
call_graph->op_arrays_count++;
4745
}
4846

‎ext/opcache/Optimizer/zend_call_graph.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ struct _zend_call_info {
3434
zend_function *callee_func;
3535
zend_call_info *next_caller;
3636
zend_call_info *next_callee;
37-
zend_func_info *clone;
3837
zend_bool recursive;
3938
zend_bool send_unpack; /* Parameters passed by SEND_UNPACK or SEND_ARRAY */
4039
int num_args;
@@ -48,8 +47,6 @@ struct _zend_func_info {
4847
zend_call_info *caller_info; /* where this function is called from */
4948
zend_call_info *callee_info; /* which functions are called from this one */
5049
zend_call_info **call_map; /* Call info associated with init/call/send opnum */
51-
int num_args; /* (-1 - unknown) */
52-
int return_value_used; /* -1 unknown, 0 no, 1 yes */
5350
zend_ssa_var_info return_info;
5451
};
5552

‎ext/opcache/Optimizer/zend_dump.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -909,9 +909,6 @@ void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, cons
909909
fprintf(stderr, ":\n ; (lines=%d, args=%d",
910910
op_array->last,
911911
op_array->num_args);
912-
if (func_info && func_info->num_args >= 0) {
913-
fprintf(stderr, "/%d", func_info->num_args);
914-
}
915912
fprintf(stderr, ", vars=%d, tmps=%d", op_array->last_var, op_array->T);
916913
if (ssa) {
917914
fprintf(stderr, ", ssa_vars=%d", ssa->vars_count);
@@ -958,11 +955,6 @@ void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, cons
958955
fprintf(stderr, ", inline");
959956
}
960957
#endif
961-
if (func_info && func_info->return_value_used == 0) {
962-
fprintf(stderr, ", no_return_value");
963-
} else if (func_info && func_info->return_value_used == 1) {
964-
fprintf(stderr, ", return_value");
965-
}
966958
fprintf(stderr, ")\n");
967959
if (msg) {
968960
fprintf(stderr, " ; (%s)\n", msg);

‎ext/opcache/jit/zend_jit.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3132,8 +3132,6 @@ static int zend_jit_collect_calls(zend_op_array *op_array, zend_script *script)
31323132
func_info = zend_arena_calloc(&CG(arena), 1, sizeof(zend_func_info));
31333133
ZEND_SET_FUNC_INFO(op_array, func_info);
31343134
}
3135-
func_info->num_args = -1;
3136-
func_info->return_value_used = -1;
31373135
return zend_analyze_calls(&CG(arena), script, ZEND_CALL_TREE, op_array, func_info);
31383136
}
31393137

@@ -3150,8 +3148,6 @@ static void zend_jit_cleanup_func_info(zend_op_array *op_array)
31503148
JIT_G(trigger) == ZEND_JIT_ON_PROF_REQUEST ||
31513149
JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) {
31523150
memset(func_info, 0, sizeof(zend_func_info));
3153-
func_info->num_args = -1;
3154-
func_info->return_value_used = -1;
31553151
} else {
31563152
ZEND_SET_FUNC_INFO(op_array, NULL);
31573153
}
@@ -3336,8 +3332,6 @@ static int zend_jit_setup_hot_counters(zend_op_array *op_array)
33363332

33373333
jit_extension = (zend_jit_op_array_hot_extension*)zend_shared_alloc(sizeof(zend_jit_op_array_hot_extension) + (op_array->last - 1) * sizeof(void*));
33383334
memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
3339-
jit_extension->func_info.num_args = -1;
3340-
jit_extension->func_info.return_value_used = -1;
33413335
jit_extension->counter = &zend_jit_hot_counters[zend_jit_op_array_hash(op_array) & (ZEND_HOT_COUNTERS_COUNT - 1)];
33423336
for (i = 0; i < op_array->last; i++) {
33433337
jit_extension->orig_handlers[i] = op_array->opcodes[i].handler;
@@ -3408,8 +3402,6 @@ ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
34083402
}
34093403
jit_extension = (zend_jit_op_array_extension*)zend_shared_alloc(sizeof(zend_jit_op_array_extension));
34103404
memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
3411-
jit_extension->func_info.num_args = -1;
3412-
jit_extension->func_info.return_value_used = -1;
34133405
jit_extension->orig_handler = (void*)opline->handler;
34143406
ZEND_SET_FUNC_INFO(op_array, (void*)jit_extension);
34153407
opline->handler = (const void*)zend_jit_runtime_jit_handler;
@@ -3429,8 +3421,6 @@ ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
34293421
}
34303422
jit_extension = (zend_jit_op_array_extension*)zend_shared_alloc(sizeof(zend_jit_op_array_extension));
34313423
memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
3432-
jit_extension->func_info.num_args = -1;
3433-
jit_extension->func_info.return_value_used = -1;
34343424
jit_extension->orig_handler = (void*)opline->handler;
34353425
ZEND_SET_FUNC_INFO(op_array, (void*)jit_extension);
34363426
opline->handler = (const void*)zend_jit_profile_jit_handler;

‎ext/opcache/jit/zend_jit_trace.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,6 @@ static zend_ssa *zend_jit_trace_build_ssa(const zend_op_array *op_array, zend_sc
483483
jit_extension =
484484
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
485485
memset(&jit_extension->func_info, 0, sizeof(jit_extension->func_info));
486-
jit_extension->func_info.num_args = -1;
487-
jit_extension->func_info.return_value_used = -1;
488486
ssa = &jit_extension->func_info.ssa;
489487

490488
if (JIT_G(opt_level) >= ZEND_JIT_LEVEL_OPT_FUNC) {
@@ -4714,8 +4712,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
47144712
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
47154713

47164714
memset(&jit_extension->func_info, 0, sizeof(jit_extension->func_info));
4717-
jit_extension->func_info.num_args = -1;
4718-
jit_extension->func_info.return_value_used = -1;
47194715
}
47204716

47214717
zend_arena_release(&CG(arena), checkpoint);
@@ -5763,8 +5759,6 @@ static int zend_jit_setup_hot_trace_counters(zend_op_array *op_array)
57635759

57645760
jit_extension = (zend_jit_op_array_trace_extension*)zend_shared_alloc(sizeof(zend_jit_op_array_trace_extension) + (op_array->last - 1) * sizeof(zend_op_trace_info));
57655761
memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
5766-
jit_extension->func_info.num_args = -1;
5767-
jit_extension->func_info.return_value_used = -1;
57685762
jit_extension->op_array = op_array;
57695763
jit_extension->offset = (char*)jit_extension->trace_info - (char*)op_array->opcodes;
57705764
for (i = 0; i < op_array->last; i++) {

0 commit comments

Comments
 (0)