diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-20 22:56:51 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-20 22:56:51 +0200 |
| commit | 94fb5391e77d22046569eafddf061b29cec07c88 (patch) | |
| tree | 30a9057d2738b0eb64d3dba302c37152eae7af89 | |
| parent | 7aa2be060ce1a11f124be7d03b0a526a715e07ba (diff) | |
| download | php-git-94fb5391e77d22046569eafddf061b29cec07c88.tar.gz | |
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().
| -rw-r--r-- | Zend/zend_vm_def.h | 3 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index bbeb2fa158..8a6cd782fe 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2826,9 +2826,6 @@ ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMPVAR|UNUSED|CV) USE_OPLINE SAVE_OPLINE(); - if (EG(exception)) { - zend_exception_save(); - } if (OP2_TYPE == IS_UNUSED) { Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 0259a3c8fa..2be1016018 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1858,9 +1858,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER USE_OPLINE SAVE_OPLINE(); - if (EG(exception)) { - zend_exception_save(); - } if (IS_CONST == IS_UNUSED) { Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -2261,9 +2258,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLE USE_OPLINE SAVE_OPLINE(); - if (EG(exception)) { - zend_exception_save(); - } if (IS_UNUSED == IS_UNUSED) { Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -2305,9 +2299,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZE USE_OPLINE SAVE_OPLINE(); - if (EG(exception)) { - zend_exception_save(); - } if (IS_CV == IS_UNUSED) { Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -2553,9 +2544,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_TMPVAR_HANDLE USE_OPLINE SAVE_OPLINE(); - if (EG(exception)) { - zend_exception_save(); - } if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) { Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); |