From: Nikita Popov <nikic@php.net>
Date: Fri, 29 Apr 2016 20:15:38 +0000 (+0200)
Subject: Drop dead code from update_constant
X-Git-Tag: php-7.1.0alpha1~233^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d048837a46ca9505fcfd13e6c5c1268e43d5eb4a;p=php

Drop dead code from update_constant
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 2acf29c2ce..794c7f0fc9 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -608,21 +608,8 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */
 						Z_TYPE_FLAGS_P(p) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE;
 					}
 				}
-				if (actual[0] == '\\') {
-					if (inline_change) {
-						memmove(Z_STRVAL_P(p), Z_STRVAL_P(p)+1, Z_STRLEN_P(p));
-						--Z_STRLEN_P(p);
-					} else {
-						++actual;
-					}
-					--actual_len;
-				}
 				if ((Z_CONST_FLAGS_P(p) & IS_CONSTANT_UNQUALIFIED) == 0) {
-					if (ZSTR_VAL(save)[0] == '\\') {
-						zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save) + 1);
-					} else {
-						zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save));
-					}
+					zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save));
 					if (inline_change) {
 						zend_string_release(save);
 					}