diff options
author | David Majnemer <david.majnemer@gmail.com> | 2016-07-27 02:39:16 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2016-07-27 02:39:16 +0000 |
commit | 00429d5fa925f838b2cbd7643a0094a9654d7338 (patch) | |
tree | 6241e8b7cfbd4444cbab0d617c288a7e438cda51 /lib/Analysis/ConstantFolding.cpp | |
parent | e60e6f67027c24339c28a904caa9ef6d23c90588 (diff) |
[ConstantFolding] Correctly handle failures in ConstantFoldConstantExpressionImpl
Failures in ConstantFoldConstantExpressionImpl were ignored causing
crashes down the line.
This fixes PR28725.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276827 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Analysis/ConstantFolding.cpp')
-rw-r--r-- | lib/Analysis/ConstantFolding.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp index c9adaa7b111..8f67492971d 100644 --- a/lib/Analysis/ConstantFolding.cpp +++ b/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<Constant>(&OpU); // Fold the Instruction's operands. - if (auto *NewCE = dyn_cast<ConstantExpr>(Op)) - Op = ConstantFoldConstantExpression(NewCE, DL, TLI); + if (auto *NewCE = dyn_cast<ConstantExpr>(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<ConstantExpr>(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); } |