From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 2 Dec 2016 12:40:04 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af2d47c9c799dc62d6162481f304f7b14626ac46;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Eliminated useless exception check
---

af2d47c9c799dc62d6162481f304f7b14626ac46
diff --cc Zend/zend_vm_def.h
index 0f1d754f8c,91e5b38914..ebaa047aa5
--- a/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 cb49393dd3,43d4256027..5c99685c9a
--- a/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();
  	}