diff options
| author | Nuno Lopes <nunoplopes@sapo.pt> | 2010-04-16 23:19:41 +0000 |
|---|---|---|
| committer | Nuno Lopes <nunoplopes@sapo.pt> | 2010-04-16 23:19:41 +0000 |
| commit | 74b595256af7e795de0706d23d2b7927fb7a3224 (patch) | |
| tree | 7213b0369ebd0fb8b9d90cddc3a9c7ee6943083f /clang/lib/CodeGen/CGExprConstant.cpp | |
| parent | 37df662b1c0c3b3b6acb4f5051a7734a70389df7 (diff) | |
| download | bcm5719-llvm-74b595256af7e795de0706d23d2b7927fb7a3224.tar.gz bcm5719-llvm-74b595256af7e795de0706d23d2b7927fb7a3224.zip | |
fix PR6766: codegen of var initialized with wide char
llvm-svn: 101568
Diffstat (limited to 'clang/lib/CodeGen/CGExprConstant.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprConstant.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp index 82156f72602..6612070c64c 100644 --- a/clang/lib/CodeGen/CGExprConstant.cpp +++ b/clang/lib/CodeGen/CGExprConstant.cpp @@ -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(); |
