From cfb313bd56fb935c54544489d71d77364fd312db Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Fri, 30 May 2008 12:02:14 +0000 Subject: [PATCH] Fix constant vector init for initializer lists with an incomplete list of elements. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51769 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExprConstant.cpp | 15 +++++++++------ test/CodeGen/vector.c | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index ca7a580ef7..1144cf1c91 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -242,20 +242,23 @@ public: llvm::Constant *EmitVectorInitialization(InitListExpr *ILE) { const llvm::VectorType *VType = cast(ConvertType(ILE->getType())); - std::vector Elts; - unsigned NumInitElements = ILE->getNumInits(); + const llvm::Type *ElemTy = VType->getElementType(); + std::vector Elts; unsigned NumElements = VType->getNumElements(); + unsigned NumInitElements = ILE->getNumInits(); + + unsigned NumInitableElts = std::min(NumInitElements, NumElements); - // FIXME: Handle case in assertion correctly - assert (NumInitElements == NumElements - && "Unsufficient vector init elelments"); // Copy initializer elements. unsigned i = 0; - for (; i < NumElements; ++i) { + for (; i < NumInitableElts; ++i) { llvm::Constant *C = Visit(ILE->getInit(i)); Elts.push_back(C); } + for (; i < NumElements; ++i) + Elts.push_back(llvm::Constant::getNullValue(ElemTy)); + return llvm::ConstantVector::get(VType, Elts); } diff --git a/test/CodeGen/vector.c b/test/CodeGen/vector.c index 52ad19fc15..ac9922524e 100644 --- a/test/CodeGen/vector.c +++ b/test/CodeGen/vector.c @@ -5,3 +5,7 @@ void f() { __v4hi A = (__v4hi)0LL; } + +__v4hi x = {1,2,3}; +__v4hi y = {1,2,3,4}; +__v4hi z = {1,2,3,4,5}; -- 2.40.0