Skip to content

Commit feb3800

Browse files
GirgiasGirgias
committed
Revert zend_execute.c
1 parent 557fea1 commit feb3800

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎Zend/zend_execute.c

+51-51
Original file line numberDiff line numberDiff line change
@@ -1590,18 +1590,18 @@ static void frameless_observed_call_copy(zend_execute_data *call, uint32_t arg,
15901590

15911591
ZEND_API void zend_frameless_observed_call(zend_execute_data *execute_data)
15921592
{
1593-
const zend_op *opline_ptr = EX(opline);
1594-
uint8_t num_args = ZEND_FLF_NUM_ARGS(opline_ptr->opcode);
1595-
zend_function *fbc = ZEND_FLF_FUNC(opline_ptr);
1596-
zval *result = EX_VAR(opline_ptr->result.var);
1593+
const zend_op *opline = EX(opline);
1594+
uint8_t num_args = ZEND_FLF_NUM_ARGS(opline->opcode);
1595+
zend_function *fbc = ZEND_FLF_FUNC(opline);
1596+
zval *result = EX_VAR(opline->result.var);
15971597

15981598
zend_execute_data *call = zend_vm_stack_push_call_frame_ex(zend_vm_calc_used_stack(num_args, fbc), ZEND_CALL_NESTED_FUNCTION, fbc, num_args, NULL);
15991599
call->prev_execute_data = execute_data;
16001600

16011601
switch (num_args) {
1602-
case 3: frameless_observed_call_copy(call, 2, zend_get_zval_ptr(opline_ptr+1, (opline_ptr+1)->op1_type, &(opline_ptr+1)->op1, execute_data)); ZEND_FALLTHROUGH;
1603-
case 2: frameless_observed_call_copy(call, 1, zend_get_zval_ptr(opline_ptr, opline_ptr->op2_type, &opline_ptr->op2, execute_data)); ZEND_FALLTHROUGH;
1604-
case 1: frameless_observed_call_copy(call, 0, zend_get_zval_ptr(opline_ptr, opline_ptr->op1_type, &opline_ptr->op1, execute_data));
1602+
case 3: frameless_observed_call_copy(call, 2, zend_get_zval_ptr(opline+1, (opline+1)->op1_type, &(opline+1)->op1, execute_data)); ZEND_FALLTHROUGH;
1603+
case 2: frameless_observed_call_copy(call, 1, zend_get_zval_ptr(opline, opline->op2_type, &opline->op2, execute_data)); ZEND_FALLTHROUGH;
1604+
case 1: frameless_observed_call_copy(call, 0, zend_get_zval_ptr(opline, opline->op1_type, &opline->op1, execute_data));
16051605
}
16061606

16071607
EG(current_execute_data) = call;
@@ -1770,13 +1770,13 @@ ZEND_API ZEND_COLD void zend_wrong_string_offset_error(void)
17701770
{
17711771
const char *msg = NULL;
17721772
const zend_execute_data *execute_data = EG(current_execute_data);
1773-
const zend_op *opline_ptr = execute_data->opline;
1773+
const zend_op *opline = execute_data->opline;
17741774

17751775
if (UNEXPECTED(EG(exception) != NULL)) {
17761776
return;
17771777
}
17781778

1779-
switch (opline_ptr->opcode) {
1779+
switch (opline->opcode) {
17801780
case ZEND_ASSIGN_DIM_OP:
17811781
msg = "Cannot use assign-op operators with string offsets";
17821782
break;
@@ -1787,7 +1787,7 @@ ZEND_API ZEND_COLD void zend_wrong_string_offset_error(void)
17871787
case ZEND_FETCH_DIM_RW:
17881788
case ZEND_FETCH_DIM_FUNC_ARG:
17891789
case ZEND_FETCH_DIM_UNSET:
1790-
switch (opline_ptr->extended_value) {
1790+
switch (opline->extended_value) {
17911791
case ZEND_FETCH_DIM_REF:
17921792
msg = "Cannot create references to/from string offsets";
17931793
break;
@@ -4444,21 +4444,21 @@ static zend_always_inline zend_generator *zend_get_running_generator(EXECUTE_DAT
44444444

44454445
ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data, zend_execute_data *call, uint32_t op_num, zend_get_gc_buffer *buf) /* {{{ */
44464446
{
4447-
zend_op *opline_ptr = EX(func)->op_array.opcodes + op_num;
4447+
zend_op *opline = EX(func)->op_array.opcodes + op_num;
44484448
int level;
44494449
int do_exit;
44504450
uint32_t num_args;
44514451

4452-
if (UNEXPECTED(opline_ptr->opcode == ZEND_INIT_FCALL ||
4453-
opline_ptr->opcode == ZEND_INIT_FCALL_BY_NAME ||
4454-
opline_ptr->opcode == ZEND_INIT_NS_FCALL_BY_NAME ||
4455-
opline_ptr->opcode == ZEND_INIT_DYNAMIC_CALL ||
4456-
opline_ptr->opcode == ZEND_INIT_USER_CALL ||
4457-
opline_ptr->opcode == ZEND_INIT_METHOD_CALL ||
4458-
opline_ptr->opcode == ZEND_INIT_STATIC_METHOD_CALL ||
4459-
opline_ptr->opcode == ZEND_NEW)) {
4452+
if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL ||
4453+
opline->opcode == ZEND_INIT_FCALL_BY_NAME ||
4454+
opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME ||
4455+
opline->opcode == ZEND_INIT_DYNAMIC_CALL ||
4456+
opline->opcode == ZEND_INIT_USER_CALL ||
4457+
opline->opcode == ZEND_INIT_METHOD_CALL ||
4458+
opline->opcode == ZEND_INIT_STATIC_METHOD_CALL ||
4459+
opline->opcode == ZEND_NEW)) {
44604460
ZEND_ASSERT(op_num);
4461-
opline_ptr--;
4461+
opline--;
44624462
}
44634463

44644464
do {
@@ -4467,7 +4467,7 @@ ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data, zend_exe
44674467
do_exit = 0;
44684468
num_args = ZEND_CALL_NUM_ARGS(call);
44694469
do {
4470-
switch (opline_ptr->opcode) {
4470+
switch (opline->opcode) {
44714471
case ZEND_DO_FCALL:
44724472
case ZEND_DO_ICALL:
44734473
case ZEND_DO_UCALL:
@@ -4500,8 +4500,8 @@ ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data, zend_exe
45004500
case ZEND_SEND_USER:
45014501
if (level == 0) {
45024502
/* For named args, the number of arguments is up to date. */
4503-
if (opline_ptr->op2_type != IS_CONST) {
4504-
num_args = opline_ptr->op2.num;
4503+
if (opline->op2_type != IS_CONST) {
4504+
num_args = opline->op2.num;
45054505
}
45064506
do_exit = 1;
45074507
}
@@ -4515,15 +4515,15 @@ ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data, zend_exe
45154515
break;
45164516
}
45174517
if (!do_exit) {
4518-
opline_ptr--;
4518+
opline--;
45194519
}
45204520
} while (!do_exit);
45214521
if (call->prev_execute_data) {
45224522
/* skip current call region */
45234523
level = 0;
45244524
do_exit = 0;
45254525
do {
4526-
switch (opline_ptr->opcode) {
4526+
switch (opline->opcode) {
45274527
case ZEND_DO_FCALL:
45284528
case ZEND_DO_ICALL:
45294529
case ZEND_DO_UCALL:
@@ -4545,7 +4545,7 @@ ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data, zend_exe
45454545
level--;
45464546
break;
45474547
}
4548-
opline_ptr--;
4548+
opline--;
45494549
} while (!do_exit);
45504550
}
45514551

@@ -4578,21 +4578,21 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
45784578
{
45794579
if (UNEXPECTED(EX(call))) {
45804580
zend_execute_data *call = EX(call);
4581-
zend_op *opline_ptr = EX(func)->op_array.opcodes + op_num;
4581+
zend_op *opline = EX(func)->op_array.opcodes + op_num;
45824582
int level;
45834583
int do_exit;
45844584

4585-
if (UNEXPECTED(opline_ptr->opcode == ZEND_INIT_FCALL ||
4586-
opline_ptr->opcode == ZEND_INIT_FCALL_BY_NAME ||
4587-
opline_ptr->opcode == ZEND_INIT_NS_FCALL_BY_NAME ||
4588-
opline_ptr->opcode == ZEND_INIT_DYNAMIC_CALL ||
4589-
opline_ptr->opcode == ZEND_INIT_USER_CALL ||
4590-
opline_ptr->opcode == ZEND_INIT_METHOD_CALL ||
4591-
opline_ptr->opcode == ZEND_INIT_STATIC_METHOD_CALL ||
4592-
opline_ptr->opcode == ZEND_INIT_PARENT_PROPERTY_HOOK_CALL ||
4593-
opline_ptr->opcode == ZEND_NEW)) {
4585+
if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL ||
4586+
opline->opcode == ZEND_INIT_FCALL_BY_NAME ||
4587+
opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME ||
4588+
opline->opcode == ZEND_INIT_DYNAMIC_CALL ||
4589+
opline->opcode == ZEND_INIT_USER_CALL ||
4590+
opline->opcode == ZEND_INIT_METHOD_CALL ||
4591+
opline->opcode == ZEND_INIT_STATIC_METHOD_CALL ||
4592+
opline->opcode == ZEND_INIT_PARENT_PROPERTY_HOOK_CALL ||
4593+
opline->opcode == ZEND_NEW)) {
45944594
ZEND_ASSERT(op_num);
4595-
opline_ptr--;
4595+
opline--;
45964596
}
45974597

45984598
do {
@@ -4603,7 +4603,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
46034603
level = 0;
46044604
do_exit = 0;
46054605
do {
4606-
switch (opline_ptr->opcode) {
4606+
switch (opline->opcode) {
46074607
case ZEND_DO_FCALL:
46084608
case ZEND_DO_ICALL:
46094609
case ZEND_DO_UCALL:
@@ -4637,8 +4637,8 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
46374637
case ZEND_SEND_USER:
46384638
if (level == 0) {
46394639
/* For named args, the number of arguments is up to date. */
4640-
if (opline_ptr->op2_type != IS_CONST) {
4641-
ZEND_CALL_NUM_ARGS(call) = opline_ptr->op2.num;
4640+
if (opline->op2_type != IS_CONST) {
4641+
ZEND_CALL_NUM_ARGS(call) = opline->op2.num;
46424642
}
46434643
do_exit = 1;
46444644
}
@@ -4652,15 +4652,15 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
46524652
break;
46534653
}
46544654
if (!do_exit) {
4655-
opline_ptr--;
4655+
opline--;
46564656
}
46574657
} while (!do_exit);
46584658
if (call->prev_execute_data) {
46594659
/* skip current call region */
46604660
level = 0;
46614661
do_exit = 0;
46624662
do {
4663-
switch (opline_ptr->opcode) {
4663+
switch (opline->opcode) {
46644664
case ZEND_DO_FCALL:
46654665
case ZEND_DO_ICALL:
46664666
case ZEND_DO_UCALL:
@@ -4683,7 +4683,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
46834683
level--;
46844684
break;
46854685
}
4686-
opline_ptr--;
4686+
opline--;
46874687
} while (!do_exit);
46884688
}
46894689

@@ -5386,10 +5386,10 @@ zval * ZEND_FASTCALL zend_handle_named_arg(
53865386
return arg;
53875387
}
53885388

5389-
static zend_execute_data *start_fake_frame(zend_execute_data *call, const zend_op *opline_ptr) {
5389+
static zend_execute_data *start_fake_frame(zend_execute_data *call, const zend_op *opline) {
53905390
zend_execute_data *old_prev_execute_data = call->prev_execute_data;
53915391
call->prev_execute_data = EG(current_execute_data);
5392-
call->opline = opline_ptr;
5392+
call->opline = opline;
53935393
EG(current_execute_data) = call;
53945394
return old_prev_execute_data;
53955395
}
@@ -5414,9 +5414,9 @@ ZEND_API zend_result ZEND_FASTCALL zend_handle_undef_args(zend_execute_data *cal
54145414
continue;
54155415
}
54165416

5417-
zend_op *opline_ptr = &op_array->opcodes[i];
5418-
if (EXPECTED(opline_ptr->opcode == ZEND_RECV_INIT)) {
5419-
zval *default_value = RT_CONSTANT(opline_ptr, opline_ptr->op2);
5417+
zend_op *opline = &op_array->opcodes[i];
5418+
if (EXPECTED(opline->opcode == ZEND_RECV_INIT)) {
5419+
zval *default_value = RT_CONSTANT(opline, opline->op2);
54205420
if (Z_OPT_TYPE_P(default_value) == IS_CONSTANT_AST) {
54215421
if (UNEXPECTED(!RUN_TIME_CACHE(op_array))) {
54225422
init_func_run_time_cache(op_array);
@@ -5434,7 +5434,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_handle_undef_args(zend_execute_data *cal
54345434
* value is not accessible through back traces. */
54355435
zval tmp;
54365436
ZVAL_COPY(&tmp, default_value);
5437-
zend_execute_data *old = start_fake_frame(call, opline_ptr);
5437+
zend_execute_data *old = start_fake_frame(call, opline);
54385438
zend_result ret = zval_update_constant_ex(&tmp, fbc->op_array.scope);
54395439
end_fake_frame(call, old);
54405440
if (UNEXPECTED(ret == FAILURE)) {
@@ -5450,8 +5450,8 @@ ZEND_API zend_result ZEND_FASTCALL zend_handle_undef_args(zend_execute_data *cal
54505450
ZVAL_COPY(arg, default_value);
54515451
}
54525452
} else {
5453-
ZEND_ASSERT(opline_ptr->opcode == ZEND_RECV);
5454-
zend_execute_data *old = start_fake_frame(call, opline_ptr);
5453+
ZEND_ASSERT(opline->opcode == ZEND_RECV);
5454+
zend_execute_data *old = start_fake_frame(call, opline);
54555455
zend_argument_error(zend_ce_argument_count_error, i + 1, "not passed");
54565456
end_fake_frame(call, old);
54575457
return FAILURE;

0 commit comments

Comments
 (0)