Implement directly in parser to avoid compiler complications

theodorejb · theodorejb · commit 8131dbcad598 · 2019-07-17T08:07:28.000-05:00
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -714,7 +714,7 @@ ZEND_API int ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast, zend_c
 				zval_ptr_dtor_nogc(&op1);
 				ret = FAILURE;
 			} else {
-				zend_fetch_dimension_const(result, &op1, &op2, (ast->attr & ZEND_DIM_IS) ? BP_VAR_IS : BP_VAR_R);
+				zend_fetch_dimension_const(result, &op1, &op2, (ast->attr == ZEND_DIM_IS) ? BP_VAR_IS : BP_VAR_R);
 
 				zval_ptr_dtor_nogc(&op1);
 				zval_ptr_dtor_nogc(&op2);
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -2371,10 +2371,6 @@ static inline void zend_emit_assign_znode(zend_ast *var_ast, znode *value_node)
 
 static zend_op *zend_delayed_compile_dim(znode *result, zend_ast *ast, uint32_t type) /* {{{ */
 {
-	if (ast->attr == ZEND_ALTERNATIVE_ARRAY_SYNTAX) {
-		zend_error(E_DEPRECATED, "Array and string offset access syntax with curly braces is deprecated");
-	}
-
 	zend_ast *var_ast = ast->child[0];
 	zend_ast *dim_ast = ast->child[1];
 	zend_op *opline;
@@ -8748,7 +8744,7 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
 		case ZEND_AST_COALESCE:
 			/* Set isset fetch indicator here, opcache disallows runtime altering of the AST */
 			if (ast->child[0]->kind == ZEND_AST_DIM) {
-				ast->child[0]->attr |= ZEND_DIM_IS;
+				ast->child[0]->attr = ZEND_DIM_IS;
 			}
 			zend_eval_const_expr(&ast->child[0]);
 
@@ -8802,13 +8798,9 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading");
 			}
 
-			if (ast->attr & ZEND_ALTERNATIVE_ARRAY_SYNTAX) {
-				zend_error(E_DEPRECATED, "Array and string offset access syntax with curly braces is deprecated");
-			}
-
 			/* Set isset fetch indicator here, opcache disallows runtime altering of the AST */
-			if (ast->attr & ZEND_DIM_IS && ast->child[0]->kind == ZEND_AST_DIM) {
-				ast->child[0]->attr |= ZEND_DIM_IS;
+			if (ast->attr == ZEND_DIM_IS && ast->child[0]->kind == ZEND_AST_DIM) {
+				ast->child[0]->attr = ZEND_DIM_IS;
 			}
 
 			zend_eval_const_expr(&ast->child[0]);
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -991,9 +991,6 @@ static zend_always_inline int zend_check_arg_send_type(const zend_function *zf,
 #define ZEND_ARRAY_NOT_PACKED		(1<<1)
 #define ZEND_ARRAY_SIZE_SHIFT		2
 
-/* Array/string access syntax with curly braces is used */
-#define ZEND_ALTERNATIVE_ARRAY_SYNTAX			2
-
 /* Attribute for ternary inside parentheses */
 #define ZEND_PARENTHESIZED_CONDITIONAL 1
 
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1155,7 +1155,10 @@ callable_variable:
 	|	constant '[' optional_expr ']'
 			{ $$ = zend_ast_create(ZEND_AST_DIM, $1, $3); }
 	|	dereferencable '{' expr '}'
-			{ $$ = zend_ast_create_ex(ZEND_AST_DIM, ZEND_ALTERNATIVE_ARRAY_SYNTAX, $1, $3); }
+			{
+				$$ = zend_ast_create(ZEND_AST_DIM, $1, $3);
+				zend_error(E_DEPRECATED, "Array and string offset access syntax with curly braces is deprecated");
+			}
 	|	dereferencable T_OBJECT_OPERATOR property_name argument_list
 			{ $$ = zend_ast_create(ZEND_AST_METHOD_CALL, $1, $3, $4); }
 	|	function_call { $$ = $1; }
