From bc36b15253b20026e62a180e8a38d0a89c1d7663 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Wed, 27 Jul 2016 02:39:16 +0000 Subject: [ConstantFolding] Correctly handle failures in ConstantFoldConstantExpressionImpl Failures in ConstantFoldConstantExpressionImpl were ignored causing crashes down the line. This fixes PR28725. llvm-svn: 276827 --- llvm/lib/Analysis/ConstantFolding.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Analysis/ConstantFolding.cpp') diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp index c9adaa7b111..8f67492971d 100644 --- a/llvm/lib/Analysis/ConstantFolding.cpp +++ b/llvm/lib/Analysis/ConstantFolding.cpp @@ -1007,8 +1007,12 @@ Constant *llvm::ConstantFoldInstruction(Instruction *I, const DataLayout &DL, for (const Use &OpU : I->operands()) { auto *Op = cast(&OpU); // Fold the Instruction's operands. - if (auto *NewCE = dyn_cast(Op)) - Op = ConstantFoldConstantExpression(NewCE, DL, TLI); + if (auto *NewCE = dyn_cast(Op)) { + auto *FoldedOp = ConstantFoldConstantExpression(NewCE, DL, TLI); + if (!FoldedOp) + return nullptr; + Op = FoldedOp; + } Ops.push_back(Op); } @@ -1048,8 +1052,13 @@ ConstantFoldConstantExpressionImpl(const ConstantExpr *CE, const DataLayout &DL, // Recursively fold the ConstantExpr's operands. If we have already folded // a ConstantExpr, we don't have to process it again. if (auto *NewCE = dyn_cast(NewC)) { - if (FoldedOps.insert(NewCE).second) - NewC = ConstantFoldConstantExpressionImpl(NewCE, DL, TLI, FoldedOps); + if (FoldedOps.insert(NewCE).second){ + auto *FoldedC = + ConstantFoldConstantExpressionImpl(NewCE, DL, TLI, FoldedOps); + if (!FoldedC) + return nullptr; + NewC = FoldedC; + } } Ops.push_back(NewC); } -- cgit v1.2.3