mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-31 09:11:13 +00:00
Fix a bug Brian found.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12754 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
2d26135b90
commit
627018b4b3
@ -924,6 +924,7 @@ SCEVHandle SCEVZeroExtendExpr::get(const SCEVHandle &Op, const Type *Ty) {
|
|||||||
// get - Get a canonical add expression, or something simpler if possible.
|
// get - Get a canonical add expression, or something simpler if possible.
|
||||||
SCEVHandle SCEVAddExpr::get(std::vector<SCEVHandle> &Ops) {
|
SCEVHandle SCEVAddExpr::get(std::vector<SCEVHandle> &Ops) {
|
||||||
assert(!Ops.empty() && "Cannot get empty add!");
|
assert(!Ops.empty() && "Cannot get empty add!");
|
||||||
|
if (Ops.size() == 1) return Ops[0];
|
||||||
|
|
||||||
// Sort by complexity, this groups all similar expression types together.
|
// Sort by complexity, this groups all similar expression types together.
|
||||||
std::sort(Ops.begin(), Ops.end(), SCEVComplexityCompare());
|
std::sort(Ops.begin(), Ops.end(), SCEVComplexityCompare());
|
||||||
@ -932,6 +933,7 @@ SCEVHandle SCEVAddExpr::get(std::vector<SCEVHandle> &Ops) {
|
|||||||
unsigned Idx = 0;
|
unsigned Idx = 0;
|
||||||
if (SCEVConstant *LHSC = dyn_cast<SCEVConstant>(Ops[0])) {
|
if (SCEVConstant *LHSC = dyn_cast<SCEVConstant>(Ops[0])) {
|
||||||
++Idx;
|
++Idx;
|
||||||
|
assert(Idx < Ops.size());
|
||||||
while (SCEVConstant *RHSC = dyn_cast<SCEVConstant>(Ops[Idx])) {
|
while (SCEVConstant *RHSC = dyn_cast<SCEVConstant>(Ops[Idx])) {
|
||||||
// We found two constants, fold them together!
|
// We found two constants, fold them together!
|
||||||
Constant *Fold = ConstantExpr::getAdd(LHSC->getValue(), RHSC->getValue());
|
Constant *Fold = ConstantExpr::getAdd(LHSC->getValue(), RHSC->getValue());
|
||||||
@ -954,8 +956,7 @@ SCEVHandle SCEVAddExpr::get(std::vector<SCEVHandle> &Ops) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Ops.size() == 1)
|
if (Ops.size() == 1) return Ops[0];
|
||||||
return Ops[0];
|
|
||||||
|
|
||||||
// Okay, check to see if the same value occurs in the operand list twice. If
|
// Okay, check to see if the same value occurs in the operand list twice. If
|
||||||
// so, merge them together into an multiply expression. Since we sorted the
|
// so, merge them together into an multiply expression. Since we sorted the
|
||||||
|
Loading…
Reference in New Issue
Block a user