diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-03-27 23:40:29 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-03-27 23:40:29 +0000 |
| commit | 68c56dea080efd6db7a444de84c270bf4e2d4d2e (patch) | |
| tree | f3bfcddd14be998665e6b251110f4bd543b7bf4d | |
| parent | e7dcd782df0e1cc3a63e429a866098e69db39153 (diff) | |
Fix <rdar://problem/6724396>, where we were silently dropping
GNU-style array designators, causing us to emit broken initializers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67878 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Parse/ParseInit.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGen/designated-initializers.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp index bf31e7bb85..3a42e50a9c 100644 --- a/lib/Parse/ParseInit.cpp +++ b/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/test/CodeGen/designated-initializers.c b/test/CodeGen/designated-initializers.c index 94d446c4e0..4669339286 100644 --- a/test/CodeGen/designated-initializers.c +++ b/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 +}; |