Fix precedence of compound literals

dspinellis · Jun 27, 2024 · a3ab4ba · a3ab4ba
1 parent bd1d669
commit a3ab4ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/parse.y b/src/parse.y
@@ -545,6 +545,17 @@ primary_expression:
 	| '(' compound_statement ')'
 			{ $$ = $2; }
 
+	/* Compound literal; C99 feature */
+        | '(' type_name ')' { saved_initializer_stacks.push(initializer_stack); initializer_stack = InitializerStack(); initializer_expect($2); } braced_initializer
+		{
+			if (DP()) {
+				cout << Fchar::get_path() << ':' << Fchar::get_line_num() << ": ";
+				cout << "Type of compound literal " << $2 << "\n";
+			}
+			$$ = $2;
+			initializer_stack = saved_initializer_stacks.top();
+			saved_initializer_stacks.pop();
+		}
 	| generic_selection
         ;
 
@@ -667,17 +678,6 @@ cast_expression:
 			if (DP())
 				cout << "cast to " << $2 << "\n";
 		}
-	/* Compound literal; C99 feature */
-        | '(' type_name ')' { saved_initializer_stacks.push(initializer_stack); initializer_stack = InitializerStack(); initializer_expect($2); } braced_initializer
-		{
-			if (DP()) {
-				cout << Fchar::get_path() << ':' << Fchar::get_line_num() << ": ";
-				cout << "Type of compound literal " << $2 << "\n";
-			}
-			$$ = $2;
-			initializer_stack = saved_initializer_stacks.top();
-			saved_initializer_stacks.pop();
-		}
         ;
 
 multiplicative_expression:

diff --git a/src/test/c/c19-initializers.c b/src/test/c/c19-initializers.c
@@ -6,7 +6,8 @@ main()
 	struct empty2 k = {};	/* Empty initializer */
 	k = (struct empty2){};	/* Empty compound literal */
 
-	int i;
+	// Compound literal used as a primary expression
+	int i = ((const int[]){ 64, 64, 64, 63 })[2];
 
 	typedef struct empty {} ES;
 	ES k2 = {};		/* Empty initializer */