зеркало из https://github.com/microsoft/clang.git
fix PR6766: codegen of var initialized with wide char
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101568 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Родитель
575c63a83e
Коммит
6784704d47
|
@ -615,17 +615,16 @@ 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))) &&
|
||||
ILE->getType()->getArrayElementTypeNoTypeQual()->isCharType())
|
||||
isa<ObjCEncodeExpr>(ILE->getInit(0))))
|
||||
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();
|
||||
|
||||
|
|
|
@ -31,6 +31,15 @@ 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.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o %t
|
||||
// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o - | FileCheck %s
|
||||
|
||||
void f1() {
|
||||
// Scalars in braces.
|
||||
|
@ -22,8 +22,8 @@ void f3() {
|
|||
}
|
||||
|
||||
// Constants
|
||||
// RUN: grep '@g3 = constant i32 10' %t
|
||||
// RUN: grep '@f4.g4 = internal constant i32 12' %t
|
||||
// CHECK: @g3 = constant i32 10
|
||||
// CHECK: @f4.g4 = internal constant i32 12
|
||||
const int g3 = 10;
|
||||
int f4() {
|
||||
static const int g4 = 12;
|
||||
|
|
Загрузка…
Ссылка в новой задаче