Skip to content

Commit 2b65e5b

Browse files
committed
Fix build on macOS
1 parent 7141926 commit 2b65e5b

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

Zend/zend_vm_def.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7710,7 +7710,6 @@ ZEND_VM_HELPER(zend_dispatch_try_catch_finally_helper, ANY, ANY, uint32_t try_ca
77107710

77117711
/* Uncaught exception */
77127712
if (zend_observer_fcall_op_array_extension != -1) {
7713-
EX(opline) = opline;
77147713
zend_observer_fcall_end(execute_data, EX(return_value));
77157714
}
77167715
cleanup_live_vars(execute_data, op_num, 0);
@@ -8518,7 +8517,6 @@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY, SPEC(OBSERVER))
85188517
execute_data = call;
85198518
i_init_func_execute_data(&fbc->op_array, ret, 0 EXECUTE_DATA_CC);
85208519
if (EXPECTED(zend_execute_ex == execute_ex)) {
8521-
ZEND_OBSERVER_SAVE_OPLINE();
85228520
ZEND_OBSERVER_FCALL_BEGIN(execute_data);
85238521
LOAD_OPLINE_EX();
85248522
ZEND_VM_ENTER_EX();

Zend/zend_vm_execute.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2909,7 +2909,6 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try
29092909

29102910
/* Uncaught exception */
29112911
if (zend_observer_fcall_op_array_extension != -1) {
2912-
EX(opline) = opline;
29132912
zend_observer_fcall_end(execute_data, EX(return_value));
29142913
}
29152914
cleanup_live_vars(execute_data, op_num, 0);
@@ -3153,7 +3152,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
31533152
i_init_func_execute_data(&fbc->op_array, ret, 0 EXECUTE_DATA_CC);
31543153
if (EXPECTED(zend_execute_ex == execute_ex)) {
31553154

3156-
31573155
LOAD_OPLINE_EX();
31583156
ZEND_VM_ENTER_EX();
31593157
} else {
@@ -3288,7 +3286,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_OBSERVER_
32883286
execute_data = call;
32893287
i_init_func_execute_data(&fbc->op_array, ret, 0 EXECUTE_DATA_CC);
32903288
if (EXPECTED(zend_execute_ex == execute_ex)) {
3291-
EX(opline) = opline;
32923289
zend_observer_fcall_begin(execute_data);
32933290
LOAD_OPLINE_EX();
32943291
ZEND_VM_ENTER_EX();

0 commit comments

Comments
 (0)