maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 152370
This commit is contained in:
Eli Friedman 2012-03-09 03:06:56 +00:00
parent 1bb80affe8
commit effcd47eef
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/CodeGen/CGExprConstant.cpp
View File

@ -763,7 +763,9 @@ public:
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));

4
clang/test/CodeGenCXX/static-init.cpp
View File

@ -1,6 +1,7 @@
// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// CHECK: @_ZZ1hvE1i = internal global i32 0, align 4
// CHECK: @base_req = global [4 x i8] c"foo\00", align 1
// CHECK: @_ZZN5test1L6getvarEiE3var = internal constant [4 x i32] [i32 1, i32 0, i32 2, i32 4], align 16
// CHECK: @_ZZ2h2vE1i = linkonce_odr global i32 0
@ -59,3 +60,6 @@ namespace test1 {
void test() { (void) getvar(2); }
}
// Make sure we emit the initializer correctly for the following:
char base_req[] = { "foo" };