commit effcd47eef464765c84130b667ef296da104756e
author Eli Friedman <eli.friedman@gmail.com> Fri Mar 09 03:06:56 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri Mar 09 03:06:56 2012 +0000
tree 8745231f3534d28da539093bcc97ac57e18fe5f4
parent 1bb80affe85d3497457645dd20957136f708468a

Make sure constant emission handles initializer lists with strings correctly.  Part of <rdar://problem/10957867>.

llvm-svn: 152370

clang/lib/CodeGen/CGExprConstant.cpp

diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index 61c10bb..fb019f4 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -763,7 +763,9 @@
 
   llvm::Constant *EmitArrayInitialization(InitListExpr *ILE) {
     unsigned NumInitElements = ILE->getNumInits();
-    if (NumInitElements == 1 && ILE->getType() == ILE->getInit(0)->getType() &&
+    if (NumInitElements == 1 &&
+        CGM.getContext().hasSameUnqualifiedType(ILE->getType(),
+                                                ILE->getInit(0)->getType()) &&
         (isa<StringLiteral>(ILE->getInit(0)) ||
          isa<ObjCEncodeExpr>(ILE->getInit(0))))
       return Visit(ILE->getInit(0));