Skip to content

Commit d6ab163

Browse files
dstogovdstogov
committed
cleanup
1 parent dd932f7 commit d6ab163

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

‎Zend/zend_execute.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,8 +2535,10 @@ static zend_never_inline void ZEND_FASTCALL init_func_run_time_cache(zend_op_arr
25352535
}
25362536
/* }}} */
25372537

2538-
static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_i(zend_op_array *op_array, zval *zv) /* {{{ */
2538+
static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_i(zval *zv) /* {{{ */
25392539
{
2540+
zend_op_array *op_array = Z_PTR_P(zv);
2541+
25402542
ZEND_ASSERT(op_array->run_time_cache == NULL);
25412543
if (op_array->fn_flags & ZEND_ACC_IMMUTABLE) {
25422544
zend_op_array *new_op_array = zend_arena_alloc(&CG(arena), sizeof(zend_op_array) + op_array->cache_size);
@@ -2555,9 +2557,9 @@ static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_
25552557
}
25562558
/* }}} */
25572559

2558-
static zend_never_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_ex(zend_op_array *op_array, zval *zv) /* {{{ */
2560+
static zend_never_inline zend_function* init_func_run_time_cache_ex(zval *zv) /* {{{ */
25592561
{
2560-
return init_func_run_time_cache_i(op_array, zv);
2562+
return init_func_run_time_cache_i(zv);
25612563
}
25622564
/* }}} */
25632565

@@ -2569,7 +2571,7 @@ ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name) /*
25692571
zend_function *fbc = Z_FUNC_P(zv);
25702572

25712573
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
2572-
fbc = (zend_function*)init_func_run_time_cache_i(&fbc->op_array, zv);
2574+
fbc = (zend_function*)init_func_run_time_cache_i(zv);
25732575
}
25742576
return fbc;
25752577
}
@@ -2584,7 +2586,7 @@ ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name,
25842586
zend_function *fbc = Z_FUNC_P(zv);
25852587

25862588
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
2587-
fbc = (zend_function*)init_func_run_time_cache_i(&fbc->op_array, zv);
2589+
fbc = (zend_function*)init_func_run_time_cache_i(zv);
25882590
}
25892591
return fbc;
25902592
}
@@ -3002,7 +3004,7 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_string(zend_s
30023004

30033005
fbc = Z_FUNC_P(func);
30043006
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
3005-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
3007+
fbc = init_func_run_time_cache_ex(func);
30063008
}
30073009
called_scope = NULL;
30083010
}

‎Zend/zend_vm_def.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,7 +3258,7 @@ ZEND_VM_HOT_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
32583258
}
32593259
fbc = Z_FUNC_P(func);
32603260
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
3261-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
3261+
fbc = init_func_run_time_cache_ex(func);
32623262
}
32633263
CACHE_PTR(opline->result.num, fbc);
32643264
}
@@ -3422,7 +3422,7 @@ ZEND_VM_HOT_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
34223422
}
34233423
fbc = Z_FUNC_P(func);
34243424
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
3425-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
3425+
fbc = init_func_run_time_cache_ex(func);
34263426
}
34273427
CACHE_PTR(opline->result.num, fbc);
34283428
}
@@ -3453,7 +3453,7 @@ ZEND_VM_HOT_HANDLER(61, ZEND_INIT_FCALL, NUM, CONST, NUM|CACHE_SLOT)
34533453
}
34543454
fbc = Z_FUNC_P(func);
34553455
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
3456-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
3456+
fbc = init_func_run_time_cache_ex(func);
34573457
}
34583458
CACHE_PTR(opline->result.num, fbc);
34593459
}

‎Zend/zend_vm_execute.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME
20882088
}
20892089
fbc = Z_FUNC_P(func);
20902090
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
2091-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
2091+
fbc = init_func_run_time_cache_ex(func);
20922092
}
20932093
CACHE_PTR(opline->result.num, fbc);
20942094
}
@@ -2177,7 +2177,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_NS_FCALL_BY_N
21772177
}
21782178
fbc = Z_FUNC_P(func);
21792179
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
2180-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
2180+
fbc = init_func_run_time_cache_ex(func);
21812181
}
21822182
CACHE_PTR(opline->result.num, fbc);
21832183
}
@@ -2208,7 +2208,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_SPEC_CO
22082208
}
22092209
fbc = Z_FUNC_P(func);
22102210
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
2211-
fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
2211+
fbc = init_func_run_time_cache_ex(func);
22122212
}
22132213
CACHE_PTR(opline->result.num, fbc);
22142214
}

0 commit comments

Comments
 (0)