From 41eb70a49346442c5fe2d2bb112f2e90043350ee Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 21 Feb 2018 02:49:40 +0300 Subject: [PATCH] Added expectation --- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 404e437904..6dbfd8db58 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5084,7 +5084,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED|CONST_FETCH, CONST, CACHE_SLOT) if (EXPECTED(CACHED_PTR(opline->extended_value))) { c = CACHED_PTR(opline->extended_value); - } else if ((c = zend_quick_get_constant(RT_CONSTANT(opline, opline->op2) + 1, opline->op1.num)) == NULL) { + } else if (UNEXPECTED((c = zend_quick_get_constant(RT_CONSTANT(opline, opline->op2) + 1, opline->op1.num)) == NULL)) { SAVE_OPLINE(); if ((opline->op1.num & IS_CONSTANT_UNQUALIFIED) != 0) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 30f5879328..9fa1fdede2 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -32392,7 +32392,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CON if (EXPECTED(CACHED_PTR(opline->extended_value))) { c = CACHED_PTR(opline->extended_value); - } else if ((c = zend_quick_get_constant(RT_CONSTANT(opline, opline->op2) + 1, opline->op1.num)) == NULL) { + } else if (UNEXPECTED((c = zend_quick_get_constant(RT_CONSTANT(opline, opline->op2) + 1, opline->op1.num)) == NULL)) { SAVE_OPLINE(); if ((opline->op1.num & IS_CONSTANT_UNQUALIFIED) != 0) { -- 2.50.1