Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Eliminated useless exception check

diff --cc Zend/zend_vm_def.h
index 0f1d754f8cf35da8e01597b4971d70db492fb00c,91e5b3891436d98a6f505aa94114ca45c2876aaa..ebaa047aa511028cb7326c00b8c4a1188b8d38a7
--- 1/Zend/zend_vm_def.h
--- 2/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -7873,10 -7841,13 +7873,11 @@@ ZEND_VM_HANDLER(151, ZEND_ASSERT_CHECK
  
        if (EG(assertions) <= 0) {
                zend_op *target = OP_JMP_ADDR(opline, opline->op2);
 -              zend_op *result = target - 1;
 -              SKIP_EXT_OPLINE(result);
 -              if (RETURN_VALUE_USED(result)) {
 -                      ZVAL_TRUE(EX_VAR(result->result.var));
 +              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();
        }

diff --cc Zend/zend_vm_execute.h
index cb49393dd3a1086144917b91e28450fab507e22b,43d4256027c587388d5856c790c8a6b231a4de55..5c99685c9affb2a6fb8145eeb8022ab6e93d7c95
--- 1/Zend/zend_vm_execute.h
--- 2/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -1885,10 -1650,13 +1885,11 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  
        if (EG(assertions) <= 0) {
                zend_op *target = OP_JMP_ADDR(opline, opline->op2);
 -              zend_op *result = target - 1;
 -              SKIP_EXT_OPLINE(result);
 -              if (RETURN_VALUE_USED(result)) {
 -                      ZVAL_TRUE(EX_VAR(result->result.var));
 +              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();
        }