From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 15 Mar 2017 18:50:26 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ad0a6fb047f47532ccb4513600fb6c269ad610e;p=php

Merge branch 'PHP-7.1'
---

6ad0a6fb047f47532ccb4513600fb6c269ad610e
diff --cc Zend/zend_vm_def.h
index 2cf46f699e,64dcdb623c..99daaf763a
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -4986,9 -5191,8 +4986,9 @@@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_C
  			}
  			value = &c->value;
  			if (Z_CONSTANT_P(value)) {
- 				zval_update_constant_ex(value, ce);
+ 				zval_update_constant_ex(value, c->ce);
  				if (UNEXPECTED(EG(exception) != NULL)) {
 +					ZVAL_UNDEF(EX_VAR(opline->result.var));
  					HANDLE_EXCEPTION();
  				}
  			}
diff --cc Zend/zend_vm_execute.h
index 3bdbaa936b,2bf932b47e..63175b0d57
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -5759,9 -5797,8 +5759,9 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  			}
  			value = &c->value;
  			if (Z_CONSTANT_P(value)) {
- 				zval_update_constant_ex(value, ce);
+ 				zval_update_constant_ex(value, c->ce);
  				if (UNEXPECTED(EG(exception) != NULL)) {
 +					ZVAL_UNDEF(EX_VAR(opline->result.var));
  					HANDLE_EXCEPTION();
  				}
  			}
@@@ -19451,9 -19985,8 +19451,9 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  			}
  			value = &c->value;
  			if (Z_CONSTANT_P(value)) {
- 				zval_update_constant_ex(value, ce);
+ 				zval_update_constant_ex(value, c->ce);
  				if (UNEXPECTED(EG(exception) != NULL)) {
 +					ZVAL_UNDEF(EX_VAR(opline->result.var));
  					HANDLE_EXCEPTION();
  				}
  			}
@@@ -28143,9 -29790,8 +28143,9 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  			}
  			value = &c->value;
  			if (Z_CONSTANT_P(value)) {
- 				zval_update_constant_ex(value, ce);
+ 				zval_update_constant_ex(value, c->ce);
  				if (UNEXPECTED(EG(exception) != NULL)) {
 +					ZVAL_UNDEF(EX_VAR(opline->result.var));
  					HANDLE_EXCEPTION();
  				}
  			}