Fix <rdar://problem/6724396>, where we were silently dropping

GNU-style array designators, causing us to emit broken initializers.

llvm-svn: 67878

2 files changed, 8 insertions, 2 deletions

diff --git a/clang/lib/Parse/ParseInit.cpp b/clang/lib/Parse/ParseInit.cpp
index bf31e7bb856..3a42e50a9ca 100644
--- a/clang/lib/Parse/ParseInit.cpp
+++ b/clang/lib/Parse/ParseInit.cpp
@@ -210,7 +210,8 @@ Parser::OwningExprResult Parser::ParseInitializerWithPotentialDesignator() {
       (Desig.getDesignator(0).isArrayDesignator() ||
        Desig.getDesignator(0).isArrayRangeDesignator())) {
     Diag(Tok, diag::ext_gnu_missing_equal_designator);
-    return ParseInitializer();
+    return Actions.ActOnDesignatedInitializer(Desig, SourceLocation(),
+                                              true, ParseInitializer());
   }
 
   Diag(Tok, diag::err_expected_equal_designator);
diff --git a/clang/test/CodeGen/designated-initializers.c b/clang/test/CodeGen/designated-initializers.c
index 94d446c4e0e..46693392866 100644
--- a/clang/test/CodeGen/designated-initializers.c
+++ b/clang/test/CodeGen/designated-initializers.c
@@ -1,4 +1,5 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>" &&
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 0, i32 22"
 
 struct foo {
     void *a;
@@ -14,3 +15,7 @@ int main(int argc, char **argv)
         .b = 1024,
     };
 }
+
+int b[2] = {
+    [1] 22
+};