Skip to content

Commit 94fb539

Browse files
committed
Remove bogus exception_save() from FETCH_CLASS
There can't be no exception at the start of the op. Also would miss the corresponding exception_restore().
1 parent 7aa2be0 commit 94fb539

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

Zend/zend_vm_def.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,9 +2826,6 @@ ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMPVAR|UNUSED|CV)
28262826
USE_OPLINE
28272827

28282828
SAVE_OPLINE();
2829-
if (EG(exception)) {
2830-
zend_exception_save();
2831-
}
28322829
if (OP2_TYPE == IS_UNUSED) {
28332830
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value);
28342831
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();

Zend/zend_vm_execute.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,9 +1858,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER
18581858
USE_OPLINE
18591859

18601860
SAVE_OPLINE();
1861-
if (EG(exception)) {
1862-
zend_exception_save();
1863-
}
18641861
if (IS_CONST == IS_UNUSED) {
18651862
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value);
18661863
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -2261,9 +2258,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLE
22612258
USE_OPLINE
22622259

22632260
SAVE_OPLINE();
2264-
if (EG(exception)) {
2265-
zend_exception_save();
2266-
}
22672261
if (IS_UNUSED == IS_UNUSED) {
22682262
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value);
22692263
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -2305,9 +2299,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZE
23052299
USE_OPLINE
23062300

23072301
SAVE_OPLINE();
2308-
if (EG(exception)) {
2309-
zend_exception_save();
2310-
}
23112302
if (IS_CV == IS_UNUSED) {
23122303
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value);
23132304
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -2553,9 +2544,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_TMPVAR_HANDLE
25532544
USE_OPLINE
25542545

25552546
SAVE_OPLINE();
2556-
if (EG(exception)) {
2557-
zend_exception_save();
2558-
}
25592547
if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
25602548
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value);
25612549
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();

0 commit comments

Comments
 (0)