Review + test fixes

Co-Authored-By: Arnaud Le Blanc <[email protected]>

Author: kocsismate

Zend/Optimizer/compact_literals.c

@@ -556,6 +556,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 					break;
 				case ZEND_ASSIGN_OBJ:
 				case ZEND_ASSIGN_OBJ_REF:
+				case ZEND_CLONE_INIT_PROP:
 				case ZEND_FETCH_OBJ_R:
 				case ZEND_FETCH_OBJ_W:
 				case ZEND_FETCH_OBJ_RW:

Zend/zend_language_parser.y

@@ -279,7 +279,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> attributed_statement attributed_class_statement attributed_parameter
 %type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
 %type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
-%type <ast> clone property_initializer_list non_empty_property_initializer_list property_initializer_expr
+%type <ast> clone clone_property_initializer_list non_empty_clone_property_initializer_list clone_property_initializer_expr
 %type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
 %type <ast> function_name non_empty_member_modifiers
 
@@ -1583,19 +1583,19 @@ isset_variable:
 
 clone:
 		T_CLONE expr { $$ = zend_ast_create(ZEND_AST_CLONE, $2, NULL); }
-	|	T_CLONE expr T_WITH property_initializer_list { $$ = zend_ast_create(ZEND_AST_CLONE, $2, $4); }
+	|	T_CLONE expr T_WITH clone_property_initializer_list { $$ = zend_ast_create(ZEND_AST_CLONE, $2, $4); }
 
-property_initializer_list:
+clone_property_initializer_list:
 		'{' '}'	{ $$ = zend_ast_create_list(0, ZEND_AST_PROPERTY_INITIALIZER_LIST); }
-	|	'{' non_empty_property_initializer_list possible_comma '}' { $$ = $2; }
+	|	'{' non_empty_clone_property_initializer_list possible_comma '}' { $$ = $2; }
 ;
 
-non_empty_property_initializer_list:
-		property_initializer_expr { $$ = zend_ast_create_list(1, ZEND_AST_PROPERTY_INITIALIZER_LIST, $1); }
-	|	non_empty_property_initializer_list ',' property_initializer_expr { $$ = zend_ast_list_add($1, $3); }
+non_empty_clone_property_initializer_list:
+		clone_property_initializer_expr { $$ = zend_ast_create_list(1, ZEND_AST_PROPERTY_INITIALIZER_LIST, $1); }
+	|	non_empty_clone_property_initializer_list ',' clone_property_initializer_expr { $$ = zend_ast_list_add($1, $3); }
 ;
 
-property_initializer_expr:
+clone_property_initializer_expr:
 		identifier ':' expr { $$ = zend_ast_create(ZEND_AST_INITIALIZER_EXPR, $1, $3); }
 	|	expr T_DOUBLE_ARROW expr { $$ = zend_ast_create(ZEND_AST_INITIALIZER_EXPR, $1, $3); }
 ;

ext/opcache/tests/clone_with_exception_handling.phpt

@@ -6,7 +6,6 @@ opcache
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x20000
-opcache.optimization_level=0x0CFF
 --FILE--
 <?php