Merge branch 'PHP-7.1'

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_constants.c
Simple merge

diff --cc Zend/zend_vm_def.h
index 2cf46f699eed823fffc67f1b6c3145072a0175b3,64dcdb623c6a77a413498a9649fbe834c216ee1b..99daaf763a977b54af37fbd3aee21f47e67e9120
--- 1/Zend/zend_vm_def.h
--- 2/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 3bdbaa936b5190b61edccc51502873f7de248563,2bf932b47ed75f62d700d0a65a8c82b347eee960..63175b0d57b88a9a3221109f1cfd14f4ded0b2f5
--- 1/Zend/zend_vm_execute.h
--- 2/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();
                                }
                        }