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

1 files changed, 1 insertions, 1 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;