Skip to content

Commit a696e66

Browse files
committed
Revert "fix ZEND_VM_SET_OPCODE and patch *call opcodes instead"
This reverts commit b3cdc4a.
1 parent 9fce8f9 commit a696e66

File tree

3 files changed

+13
-26
lines changed

3 files changed

+13
-26
lines changed

Zend/zend_execute.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5520,8 +5520,7 @@ static zend_always_inline zend_execute_data *_zend_vm_stack_push_call_frame(uint
55205520

55215521
#define ZEND_VM_SET_OPCODE(new_op) \
55225522
CHECK_SYMBOL_TABLES() \
5523-
OPLINE = new_op; \
5524-
ZEND_VM_INTERRUPT_CHECK()
5523+
OPLINE = new_op;
55255524

55265525
#define ZEND_VM_SET_RELATIVE_OPCODE(opline, offset) \
55275526
ZEND_VM_SET_OPCODE(ZEND_OFFSET_TO_OPLINE(opline, offset))

Zend/zend_vm_def.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4098,8 +4098,7 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
40984098
HANDLE_EXCEPTION();
40994099
}
41004100

4101-
CHECK_SYMBOL_TABLES()
4102-
OPLINE = opline + 1;
4101+
ZEND_VM_SET_OPCODE(opline + 1);
41034102
ZEND_VM_CONTINUE();
41044103
}
41054104

@@ -4228,8 +4227,7 @@ ZEND_VM_C_LABEL(fcall_by_name_end):
42284227
zend_rethrow_exception(execute_data);
42294228
HANDLE_EXCEPTION();
42304229
}
4231-
CHECK_SYMBOL_TABLES()
4232-
OPLINE = opline + 1;
4230+
ZEND_VM_SET_OPCODE(opline + 1);
42334231
ZEND_VM_CONTINUE();
42344232
}
42354233

@@ -4349,8 +4347,7 @@ ZEND_VM_C_LABEL(fcall_end):
43494347
HANDLE_EXCEPTION();
43504348
}
43514349

4352-
CHECK_SYMBOL_TABLES()
4353-
OPLINE = opline + 1;
4350+
ZEND_VM_SET_OPCODE(opline + 1);
43544351
ZEND_VM_CONTINUE();
43554352
}
43564353

Zend/zend_vm_execute.h

Lines changed: 9 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)