diff options
| author | Steve Naroff <snaroff@apple.com> | 2007-10-18 03:27:23 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2007-10-18 03:27:23 +0000 |
| commit | fd8b4a4b29a2b9d662d0c9a92c1eebd83160b10b (patch) | |
| tree | 46dbb60658301b3ca3651c701d5fa4fb26d9eb6b | |
| parent | 994f939926ddbd38d99c4fe6dcfc3530c13a9a75 (diff) | |
Fix the following bug...
unsigned char asso_values[] = { 34 };
int legal2() {
return asso_values[0];
}
The code that creates the new constant array type was operating on the original type.
As a result, the constant type being generated was "unsigned char [1][]" (which is wrong).
The fix is to operate on the element type - in this case, the correct type is "unsigned char [1]"
I added this case to array-init.c, which clearly didn't catch this bogosity...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43112 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang.xcodeproj/project.pbxproj | 1 | ||||
| -rw-r--r-- | test/Sema/array-init.c | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp index 390caafdc0..5b54d8be7d 100644 --- a/Sema/SemaDecl.cpp +++ b/Sema/SemaDecl.cpp @@ -472,7 +472,7 @@ bool Sema::CheckInitializer(Expr *&Init, QualType &DeclType, bool isStatic) { // Return a new array type from the number of initializers (C99 6.7.8p22). llvm::APSInt ConstVal(32); ConstVal = numInits; - DeclType = Context.getConstantArrayType(DeclType, ConstVal, + DeclType = Context.getConstantArrayType(VAT->getElementType(), ConstVal, ArrayType::Normal, 0); } return hadError; diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj index ab5c53c407..cf39da026b 100644 --- a/clang.xcodeproj/project.pbxproj +++ b/clang.xcodeproj/project.pbxproj @@ -745,7 +745,6 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* clang */; projectDirPath = ""; diff --git a/test/Sema/array-init.c b/test/Sema/array-init.c index 510a7792d1..5b22681d1b 100644 --- a/test/Sema/array-init.c +++ b/test/Sema/array-init.c @@ -103,6 +103,11 @@ void legal() { }; } +unsigned char asso_values[] = { 34 }; +int legal2() { + return asso_values[0]; +} + void illegal() { short q2[4][][2] = { // expected-error{{array has incomplete element type 'short [][2]'}} { 1, 0, 0, 0, 0, 0 }, |