diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2008-09-03 05:54:33 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2008-09-03 05:54:33 +0000 |
| commit | 83c05e5d30366d7c7e3d08e886dee89b1320ae7a (patch) | |
| tree | 159bca772cbcb500a1fe373010f02b1181b5e51c /lib/VMCore | |
| parent | b388eb82fb4a95e2f6d54163dfcf962b8032bae8 (diff) | |
| download | external_llvm-83c05e5d30366d7c7e3d08e886dee89b1320ae7a.zip external_llvm-83c05e5d30366d7c7e3d08e886dee89b1320ae7a.tar.gz external_llvm-83c05e5d30366d7c7e3d08e886dee89b1320ae7a.tar.bz2 | |
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!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55689 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore')
| -rw-r--r-- | lib/VMCore/ConstantFold.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp index 5167c12..25c756a 100644 --- a/lib/VMCore/ConstantFold.cpp +++ b/lib/VMCore/ConstantFold.cpp @@ -238,9 +238,12 @@ Constant *llvm::ConstantFoldCastInstruction(unsigned opc, const Constant *V, std::vector<Constant*> res; const VectorType *DestVecTy = cast<VectorType>(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<Constant*> res; const VectorType *DestVecTy = cast<VectorType>(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; |