com php-src: Merge branch 'PHP-7.1': Zend/zend_API.c Zend /zend_constants.c Zend/zend_vm_def.h Zend/zend_ vm_execute.h

Commit:    6ad0a6fb047f47532ccb4513600fb6c269ad610e
Author:    Nikita Popov <[email protected]>         Wed, 15 Mar 2017 19:50:26 +0100
Parents:   38de261563757d30c262d3d7b35c1e484576710d 2bba4a0d7f6d5e5712d60bc1cf2119622d837e55
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=6ad0a6fb047f47532ccb4513600fb6c269ad610e

Log:
Merge branch 'PHP-7.1'

Changed paths:
  MM  Zend/zend_API.c
  MM  Zend/zend_constants.c
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:
diff --cc Zend/zend_vm_def.h
index 2cf46f6,64dcdb6..99daaf7
--- 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 3bdbaa9,2bf932b..63175b0
--- 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();
  				}
  			}