RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 04:02:41 +01:00
Code Issues Projects Releases Wiki Activity

[NFC][ScalarEvolution] Fix SCEVNAryExpr::getType().

Browse Source 
SCEVNAryExpr::getType() could return the wrong type for a SCEVAddExpr.
Remove it, and add getType() methods to the relevant subclasses.

NFC because nothing uses it directly, as far as I know; this is just
future-proofing.
This commit is contained in:
Eli Friedman 2021-06-23 12:42:47 -07:00
parent 6cfd76633f
commit 8973883ff0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Analysis/ScalarEvolutionExpressions.h
View File

@ -210,8 +210,6 @@ class Type;
return make_range(op_begin(), op_end());
}
Type *getType() const { return getOperand(0)->getType(); }
NoWrapFlags getNoWrapFlags(NoWrapFlags Mask = NoWrapMask) const {
return (NoWrapFlags)(SubclassData & Mask);
}
@ -293,6 +291,8 @@ class Type;
: SCEVCommutativeExpr(ID, scMulExpr, O, N) {}
public:
Type *getType() const { return getOperand(0)->getType(); }
/// Methods for support type inquiry through isa, cast, and dyn_cast:
static bool classof(const SCEV *S) {
return S->getSCEVType() == scMulExpr;
@ -359,6 +359,7 @@ class Type;
: SCEVNAryExpr(ID, scAddRecExpr, O, N), L(l) {}
public:
Type *getType() const { return getStart()->getType(); }
const SCEV *getStart() const { return Operands[0]; }
const Loop *getLoop() const { return L; }
@ -445,6 +446,8 @@ class Type;
}
public:
Type *getType() const { return getOperand(0)->getType(); }
static bool classof(const SCEV *S) {
return isMinMaxType(S->getSCEVType());
}

4
lib/Analysis/ScalarEvolution.cpp
View File

@ -386,12 +386,14 @@ Type *SCEV::getType() const {
case scSignExtend:
return cast<SCEVCastExpr>(this)->getType();
case scAddRecExpr:
return cast<SCEVAddRecExpr>(this)->getType();
case scMulExpr:
return cast<SCEVMulExpr>(this)->getType();
case scUMaxExpr:
case scSMaxExpr:
case scUMinExpr:
case scSMinExpr:
return cast<SCEVNAryExpr>(this)->getType();
return cast<SCEVMinMaxExpr>(this)->getType();
case scAddExpr:
return cast<SCEVAddExpr>(this)->getType();
case scUDivExpr: