From: Nikita Popov <nikic@php.net>
Date: Sat, 7 Nov 2015 09:59:18 +0000 (+0100)
Subject: Strip leading backslash in update_opN_const
X-Git-Tag: php-7.0.1RC1~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00b37e718d002612e1a3cfcc01f62b9a64826960;p=php

Strip leading backslash in update_opN_const
---

diff --git a/Zend/tests/varSyntax/static_prop_on_expr_class_with_backslash.phpt b/Zend/tests/varSyntax/static_prop_on_expr_class_with_backslash.phpt
new file mode 100644
index 0000000000..c78610401f
--- /dev/null
+++ b/Zend/tests/varSyntax/static_prop_on_expr_class_with_backslash.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Static property on constexpr class with leading backslash
+--FILE--
+<?php
+
+class A {
+    public static $b = 42;
+}
+var_dump(('\A' . (string) '')::$b);
+
+?>
+--EXPECT--
+int(42)
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 1f5e4f1bf6..153de18e46 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -124,6 +124,14 @@ int zend_optimizer_is_disabled_func(const char *name, size_t len) {
 			fbc->internal_function.handler == ZEND_FN(display_disabled_function));
 }
 
+static inline void drop_leading_backslash(zval *val) {
+	if (Z_STRVAL_P(val)[0] == '\\') {
+		zend_string *str = zend_string_init(Z_STRVAL_P(val) + 1, Z_STRLEN_P(val) - 1, 0);
+		zval_dtor(val);
+		ZVAL_STR(val, str);
+	}
+}
+
 void zend_optimizer_update_op1_const(zend_op_array *op_array,
                                      zend_op       *opline,
                                      zval          *val)
@@ -140,6 +148,7 @@ void zend_optimizer_update_op1_const(zend_op_array *op_array,
 				case ZEND_FETCH_CONSTANT:
 				case ZEND_DEFINED:
 				case ZEND_NEW:
+					drop_leading_backslash(val);
 					opline->op1.constant = zend_optimizer_add_literal(op_array, val);
 					zend_string_hash_val(Z_STR(ZEND_OP1_LITERAL(opline)));
 					Z_CACHE_SLOT(op_array->literals[opline->op1.constant]) = op_array->cache_size;
@@ -173,13 +182,35 @@ void zend_optimizer_update_op2_const(zend_op_array *op_array,
 		Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) = op_array->cache_size;
 		op_array->cache_size += sizeof(void*);
 		return;
-	} else if (opline->opcode == ZEND_ROPE_INIT ||
-			opline->opcode == ZEND_ROPE_ADD ||
-			opline->opcode == ZEND_ROPE_END ||
-			opline->opcode == ZEND_CONCAT ||
-			opline->opcode == ZEND_FAST_CONCAT) {
-		convert_to_string(val);
 	}
+
+	switch (opline->opcode) {
+		case ZEND_ROPE_INIT:
+		case ZEND_ROPE_ADD:
+		case ZEND_ROPE_END:
+		case ZEND_CONCAT:
+		case ZEND_FAST_CONCAT:
+			convert_to_string(val);
+			break;
+		case ZEND_FETCH_R:
+		case ZEND_FETCH_W:
+		case ZEND_FETCH_RW:
+		case ZEND_FETCH_IS:
+		case ZEND_FETCH_UNSET:
+		case ZEND_FETCH_FUNC_ARG:
+		case ZEND_FETCH_CLASS:
+		case ZEND_INIT_FCALL_BY_NAME:
+		/*case ZEND_INIT_NS_FCALL_BY_NAME:*/
+		case ZEND_UNSET_VAR:
+		case ZEND_ISSET_ISEMPTY_VAR:
+		case ZEND_ADD_INTERFACE:
+		case ZEND_ADD_TRAIT:
+		case ZEND_INSTANCEOF:
+		case ZEND_INIT_DYNAMIC_CALL:
+			drop_leading_backslash(val);
+			break;
+	}
+
 	opline->op2.constant = zend_optimizer_add_literal(op_array, val);
 	if (Z_TYPE_P(val) == IS_STRING) {
 		zend_string_hash_val(Z_STR(ZEND_OP2_LITERAL(opline)));