mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-20 10:24:12 +00:00
Wind SCEV back in time, to Nov 18th. This 'fixes' PR3275, PR3294, PR3295,
PR3296 and PR3302. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62160 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -225,7 +225,6 @@ namespace llvm {
|
||||
return getMulExpr(Ops);
|
||||
}
|
||||
SCEVHandle getUDivExpr(const SCEVHandle &LHS, const SCEVHandle &RHS);
|
||||
SCEVHandle getSDivExpr(const SCEVHandle &LHS, const SCEVHandle &RHS);
|
||||
SCEVHandle getAddRecExpr(const SCEVHandle &Start, const SCEVHandle &Step,
|
||||
const Loop *L);
|
||||
SCEVHandle getAddRecExpr(std::vector<SCEVHandle> &Operands,
|
||||
|
@ -14,7 +14,7 @@
|
||||
#ifndef LLVM_ANALYSIS_SCALAREVOLUTION_EXPANDER_H
|
||||
#define LLVM_ANALYSIS_SCALAREVOLUTION_EXPANDER_H
|
||||
|
||||
#include "llvm/Instruction.h"
|
||||
#include "llvm/Instructions.h"
|
||||
#include "llvm/Type.h"
|
||||
#include "llvm/Analysis/ScalarEvolution.h"
|
||||
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
|
||||
@ -104,8 +104,6 @@ namespace llvm {
|
||||
|
||||
Value *visitUDivExpr(SCEVUDivExpr *S);
|
||||
|
||||
Value *visitSDivExpr(SCEVSDivExpr *S);
|
||||
|
||||
Value *visitAddRecExpr(SCEVAddRecExpr *S);
|
||||
|
||||
Value *visitSMaxExpr(SCEVSMaxExpr *S);
|
||||
@ -119,3 +117,4 @@ namespace llvm {
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -25,7 +25,7 @@ namespace llvm {
|
||||
// These should be ordered in terms of increasing complexity to make the
|
||||
// folders simpler.
|
||||
scConstant, scTruncate, scZeroExtend, scSignExtend, scAddExpr, scMulExpr,
|
||||
scUDivExpr, scSDivExpr, scAddRecExpr, scUMaxExpr, scSMaxExpr, scUnknown,
|
||||
scUDivExpr, scAddRecExpr, scUMaxExpr, scSMaxExpr, scUnknown,
|
||||
scCouldNotCompute
|
||||
};
|
||||
|
||||
@ -357,55 +357,6 @@ namespace llvm {
|
||||
};
|
||||
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
/// SCEVSDivExpr - This class represents a binary signed division operation.
|
||||
///
|
||||
class SCEVSDivExpr : public SCEV {
|
||||
friend class ScalarEvolution;
|
||||
|
||||
SCEVHandle LHS, RHS;
|
||||
SCEVSDivExpr(const SCEVHandle &lhs, const SCEVHandle &rhs)
|
||||
: SCEV(scSDivExpr), LHS(lhs), RHS(rhs) {}
|
||||
|
||||
virtual ~SCEVSDivExpr();
|
||||
public:
|
||||
const SCEVHandle &getLHS() const { return LHS; }
|
||||
const SCEVHandle &getRHS() const { return RHS; }
|
||||
|
||||
virtual bool isLoopInvariant(const Loop *L) const {
|
||||
return LHS->isLoopInvariant(L) && RHS->isLoopInvariant(L);
|
||||
}
|
||||
|
||||
virtual bool hasComputableLoopEvolution(const Loop *L) const {
|
||||
return LHS->hasComputableLoopEvolution(L) &&
|
||||
RHS->hasComputableLoopEvolution(L);
|
||||
}
|
||||
|
||||
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
|
||||
const SCEVHandle &Conc,
|
||||
ScalarEvolution &SE) const {
|
||||
SCEVHandle L = LHS->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
|
||||
SCEVHandle R = RHS->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
|
||||
if (L == LHS && R == RHS)
|
||||
return this;
|
||||
else
|
||||
return SE.getSDivExpr(L, R);
|
||||
}
|
||||
|
||||
|
||||
virtual const Type *getType() const;
|
||||
|
||||
void print(std::ostream &OS) const;
|
||||
void print(std::ostream *OS) const { if (OS) print(*OS); }
|
||||
|
||||
/// Methods for support type inquiry through isa, cast, and dyn_cast:
|
||||
static inline bool classof(const SCEVSDivExpr *S) { return true; }
|
||||
static inline bool classof(const SCEV *S) {
|
||||
return S->getSCEVType() == scSDivExpr;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
/// SCEVAddRecExpr - This node represents a polynomial recurrence on the trip
|
||||
/// count of the specified loop.
|
||||
@ -599,8 +550,6 @@ namespace llvm {
|
||||
return ((SC*)this)->visitMulExpr((SCEVMulExpr*)S);
|
||||
case scUDivExpr:
|
||||
return ((SC*)this)->visitUDivExpr((SCEVUDivExpr*)S);
|
||||
case scSDivExpr:
|
||||
return ((SC*)this)->visitSDivExpr((SCEVSDivExpr*)S);
|
||||
case scAddRecExpr:
|
||||
return ((SC*)this)->visitAddRecExpr((SCEVAddRecExpr*)S);
|
||||
case scSMaxExpr:
|
||||
|
Reference in New Issue
Block a user