]> granicus.if.org Git - php/commitdiff
Added expectation
authorDmitry Stogov <dmitry@zend.com>
Tue, 20 Feb 2018 23:49:40 +0000 (02:49 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 20 Feb 2018 23:49:40 +0000 (02:49 +0300)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 404e437904863e226cd251066be73721a2ebf6e3..6dbfd8db58ad09e02ab602803af95817814663f5 100644 (file)
@@ -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) {
index 30f58793286200680747eef2696de801855e0016..9fa1fdede221adbae8dcf012c3492a89e12d956c 100644 (file)
@@ -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) {