Merge branch 'PHP-7.1'

* PHP-7.1:
  Eliminated useless exception check
This commit is contained in:
Dmitry Stogov 2016-12-02 15:40:11 +03:00
commit 1660117799
2 changed files with 4 additions and 2 deletions

View File

@ -7849,7 +7849,8 @@ ZEND_VM_HANDLER(151, ZEND_ASSERT_CHECK, ANY, JMP_ADDR)
if (RETURN_VALUE_USED(opline)) {
ZVAL_TRUE(EX_VAR(opline->result.var));
}
ZEND_VM_JMP(target);
ZEND_VM_SET_OPCODE(target);
ZEND_VM_CONTINUE();
} else {
ZEND_VM_NEXT_OPCODE();
}

View File

@ -1888,7 +1888,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSERT_CHECK_SPEC_HANDLER(ZEND
if (RETURN_VALUE_USED(opline)) {
ZVAL_TRUE(EX_VAR(opline->result.var));
}
ZEND_VM_JMP(target);
ZEND_VM_SET_OPCODE(target);
ZEND_VM_CONTINUE();
} else {
ZEND_VM_NEXT_OPCODE();
}