From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 16 Apr 2016 18:38:10 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ed4a592aa803851649b193ed474e50b4d49ade8;p=php

Merge branch 'PHP-7.0'
---

3ed4a592aa803851649b193ed474e50b4d49ade8
diff --cc Zend/zend_vm_def.h
index e8a9ab2890,00a9effcfa..49941f9f14
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -4292,10 -4316,10 +4289,10 @@@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_R
  	arg = ZEND_CALL_VAR(EX(call), opline->result.var);
  	ZVAL_COPY_VALUE(arg, varptr);
  
- 	ZEND_VM_NEXT_OPCODE();
+ 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
 -ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, ANY)
 +ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM)
  {
  	USE_OPLINE
  	zend_free_op free_op1;