From f023db644492337f13d36cad3cbce12f76d8113f Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Wed, 3 Sep 2008 05:54:33 +0000 Subject: Don't crash when trying to constant fold a vector with some elements that can't be folded. Instead, fail to fold the entire vector. We could also return a vector with some elements folded and some not. If anyone thinks that's a better approach, please speak up! llvm-svn: 55689 --- llvm/lib/VMCore/ConstantFold.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'llvm/lib/VMCore/ConstantFold.cpp') diff --git a/llvm/lib/VMCore/ConstantFold.cpp b/llvm/lib/VMCore/ConstantFold.cpp index 5167c12d49b..25c756ab6e5 100644 --- a/llvm/lib/VMCore/ConstantFold.cpp +++ b/llvm/lib/VMCore/ConstantFold.cpp @@ -238,9 +238,12 @@ Constant *llvm::ConstantFoldCastInstruction(unsigned opc, const Constant *V, std::vector res; const VectorType *DestVecTy = cast(DestTy); const Type *DstEltTy = DestVecTy->getElementType(); - for (unsigned i = 0, e = CV->getType()->getNumElements(); i != e; ++i) - res.push_back(ConstantFoldCastInstruction(opc, V->getOperand(i), - DstEltTy)); + for (unsigned i = 0, e = CV->getType()->getNumElements(); i != e; ++i) { + Constant *C = ConstantFoldCastInstruction(opc, CV->getOperand(i), + DstEltTy); + if (!C) return 0; // Can't fold operand. + res.push_back(C); + } return ConstantVector::get(DestVecTy, res); } return 0; // Can't fold. @@ -268,9 +271,12 @@ Constant *llvm::ConstantFoldCastInstruction(unsigned opc, const Constant *V, std::vector res; const VectorType *DestVecTy = cast(DestTy); const Type *DstEltTy = DestVecTy->getElementType(); - for (unsigned i = 0, e = CV->getType()->getNumElements(); i != e; ++i) - res.push_back(ConstantFoldCastInstruction(opc, V->getOperand(i), - DstEltTy)); + for (unsigned i = 0, e = CV->getType()->getNumElements(); i != e; ++i) { + Constant *C = ConstantFoldCastInstruction(opc, CV->getOperand(i), + DstEltTy); + if (!C) return 0; // Can't fold operand. + res.push_back(C); + } return ConstantVector::get(DestVecTy, res); } return 0; -- cgit v1.2.3