[PATCH] D129745: Fix a stack overflow in ScalarEvolution.
Johannes Reifferscheid via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 3 02:08:22 PDT 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG7ae5d00afaf3: Fix a stack overflow in ScalarEvolution. (authored by jreiffers).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D129745/new/
https://reviews.llvm.org/D129745
Files:
llvm/lib/Analysis/ScalarEvolution.cpp
Index: llvm/lib/Analysis/ScalarEvolution.cpp
===================================================================
--- llvm/lib/Analysis/ScalarEvolution.cpp
+++ llvm/lib/Analysis/ScalarEvolution.cpp
@@ -7289,7 +7289,8 @@
if (auto BO = MatchBinaryOp(U, DT)) {
bool IsConstArg = isa<ConstantInt>(BO->RHS);
switch (BO->Opcode) {
- case Instruction::Add: {
+ case Instruction::Add:
+ case Instruction::Mul: {
// For additions and multiplications, traverse add/mul chains for which we
// can potentially create a single SCEV, to reduce the number of
// get{Add,Mul}Expr calls.
@@ -7302,30 +7303,24 @@
}
Ops.push_back(BO->RHS);
auto NewBO = MatchBinaryOp(BO->LHS, DT);
- if (!NewBO || (NewBO->Opcode != Instruction::Add &&
- NewBO->Opcode != Instruction::Sub)) {
+ if (!NewBO ||
+ (U->getOpcode() == Instruction::Add &&
+ (NewBO->Opcode != Instruction::Add &&
+ NewBO->Opcode != Instruction::Sub)) ||
+ (U->getOpcode() == Instruction::Mul &&
+ NewBO->Opcode != Instruction::Mul)) {
Ops.push_back(BO->LHS);
break;
}
- BO = NewBO;
- } while (true);
- return nullptr;
- }
-
- case Instruction::Mul: {
- do {
- if (BO->Op) {
- if (BO->Op != V && getExistingSCEV(BO->Op)) {
- Ops.push_back(BO->Op);
+ // CreateSCEV calls getNoWrapFlagsFromUB, which under certain conditions
+ // requires a SCEV for the LHS.
+ if (NewBO->Op && (NewBO->IsNSW || NewBO->IsNUW)) {
+ if (auto *I = dyn_cast<Instruction>(NewBO->Op);
+ I && programUndefinedIfPoison(I)) {
+ Ops.push_back(BO->LHS);
break;
}
}
- Ops.push_back(BO->RHS);
- auto NewBO = MatchBinaryOp(BO->LHS, DT);
- if (!NewBO || NewBO->Opcode != Instruction::Mul) {
- Ops.push_back(BO->LHS);
- break;
- }
BO = NewBO;
} while (true);
return nullptr;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D129745.449600.patch
Type: text/x-patch
Size: 2085 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220803/48972c45/attachment.bin>
More information about the llvm-commits
mailing list