revert r101568, which miscompiles this testcase, distilled from ldecod:

void exit_picture()
{
  char yuv_types[4][6]= {"4:0:0","4:2:0","4:2:2","4:4:4"};
  foo(yuv_types);
}



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101623 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 9 insertions, 17 deletions

diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 6612070c64..82156f7260 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -615,16 +615,17 @@ public:
   }
 
   llvm::Constant *EmitArrayInitialization(InitListExpr *ILE) {
+    std::vector<llvm::Constant*> Elts;
+    const llvm::ArrayType *AType =
+        cast<llvm::ArrayType>(ConvertType(ILE->getType()));
     unsigned NumInitElements = ILE->getNumInits();
+    // FIXME: Check for wide strings
     // FIXME: Check for NumInitElements exactly equal to 1??
     if (NumInitElements > 0 &&
         (isa<StringLiteral>(ILE->getInit(0)) ||
-         isa<ObjCEncodeExpr>(ILE->getInit(0))))
+         isa<ObjCEncodeExpr>(ILE->getInit(0))) &&
+        ILE->getType()->getArrayElementTypeNoTypeQual()->isCharType())
       return Visit(ILE->getInit(0));
-
-    std::vector<llvm::Constant*> Elts;
-    const llvm::ArrayType *AType =
-        cast<llvm::ArrayType>(ConvertType(ILE->getType()));
     const llvm::Type *ElemTy = AType->getElementType();
     unsigned NumElements = AType->getNumElements();
 
diff --git a/test/CodeGen/global-init.c b/test/CodeGen/global-init.c
index e28992f118..651f7d809a 100644
--- a/test/CodeGen/global-init.c
+++ b/test/CodeGen/global-init.c
@@ -31,15 +31,6 @@ struct ManyFields {
 struct ManyFields FewInits = {1, 2};
 
 
-// PR6766
-// CHECK: @l = global %1 { [24 x i8] c"f\00\00\00o\00\00\00o\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00", i32 1 }
-typedef __WCHAR_TYPE__ wchar_t;
-struct K {
-  wchar_t L[6];
-  int M;
-} l =  { { L"foo" }, 1 };
-
-
 // NOTE: tentative definitions are processed at the end of the translation unit.
 
 // This shouldn't be emitted as common because it has an explicit section.
diff --git a/test/CodeGen/init.c b/test/CodeGen/init.c
index d48e723c58..13ffad1731 100644
--- a/test/CodeGen/init.c
+++ b/test/CodeGen/init.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o %t
 
 void f1() {
   // Scalars in braces.
@@ -22,8 +22,8 @@ void f3() {
 }
 
 // Constants
-// CHECK: @g3 = constant i32 10
-// CHECK: @f4.g4 = internal constant i32 12
+// RUN: grep '@g3 = constant i32 10' %t
+// RUN: grep '@f4.g4 = internal constant i32 12' %t
 const int g3 = 10;
 int f4() {
   static const int g4 = 12;