replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Conform to the style guide; remove 'else' after 'return'. Also remove an extra 

if-statement by turning it into an assert. No functionality change.

llvm-svn: 147474
This commit is contained in:
Nick Lewycky 2012-01-03 20:33:00 +00:00
parent 9f3d1ac419
commit 228f5b4ba3
1 changed files with 38 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
llvm/lib/Support/ConstantRange.cpp
View File

@ -161,8 +161,7 @@ APInt ConstantRange::getSetSize() const {
APInt ConstantRange::getUnsignedMax() const { APInt ConstantRange::getUnsignedMax() const {
if (isFullSet() || isWrappedSet()) if (isFullSet() || isWrappedSet())
return APInt::getMaxValue(getBitWidth()); return APInt::getMaxValue(getBitWidth());
else return getUpper() - 1;
return getUpper() - 1;
} }
/// getUnsignedMin - Return the smallest unsigned value contained in the /// getUnsignedMin - Return the smallest unsigned value contained in the
@ -171,8 +170,7 @@ APInt ConstantRange::getUnsignedMax() const {
APInt ConstantRange::getUnsignedMin() const { APInt ConstantRange::getUnsignedMin() const {
if (isFullSet() || (isWrappedSet() && getUpper() != 0)) if (isFullSet() || (isWrappedSet() && getUpper() != 0))
return APInt::getMinValue(getBitWidth()); return APInt::getMinValue(getBitWidth());
else return getLower();
return getLower();
} }
/// getSignedMax - Return the largest signed value contained in the /// getSignedMax - Return the largest signed value contained in the
@ -183,14 +181,11 @@ APInt ConstantRange::getSignedMax() const {
if (!isWrappedSet()) { if (!isWrappedSet()) {
if (getLower().sle(getUpper() - 1)) if (getLower().sle(getUpper() - 1))
return getUpper() - 1; return getUpper() - 1;
else return SignedMax;
return SignedMax;
} else {
if (getLower().isNegative() == getUpper().isNegative())
return SignedMax;
else
return getUpper() - 1;
} }
if (getLower().isNegative() == getUpper().isNegative())
return SignedMax;
return getUpper() - 1;
} }
/// getSignedMin - Return the smallest signed value contained in the /// getSignedMin - Return the smallest signed value contained in the
@ -201,18 +196,13 @@ APInt ConstantRange::getSignedMin() const {
if (!isWrappedSet()) { if (!isWrappedSet()) {
if (getLower().sle(getUpper() - 1)) if (getLower().sle(getUpper() - 1))
return getLower(); return getLower();
else return SignedMin;
return SignedMin;
} else {
if ((getUpper() - 1).slt(getLower())) {
if (getUpper() != SignedMin)
return SignedMin;
else
return getLower();
} else {
return getLower();
}
} }
if ((getUpper() - 1).slt(getLower())) {
if (getUpper() != SignedMin)
return SignedMin;
}
return getLower();
} }
/// contains - Return true if the specified value is in the set. /// contains - Return true if the specified value is in the set.
@ -223,8 +213,7 @@ bool ConstantRange::contains(const APInt &V) const {
if (!isWrappedSet()) if (!isWrappedSet())
return Lower.ule(V) && V.ult(Upper); return Lower.ule(V) && V.ult(Upper);
else return Lower.ule(V) || V.ult(Upper);
return Lower.ule(V) || V.ult(Upper);
} }
/// contains - Return true if the argument is a subset of this range. /// contains - Return true if the argument is a subset of this range.
@ -284,15 +273,14 @@ ConstantRange ConstantRange::intersectWith(const ConstantRange &CR) const {
return ConstantRange(CR.Lower, Upper); return ConstantRange(CR.Lower, Upper);
return CR; return CR;
} else {
if (Upper.ult(CR.Upper))
return *this;
if (Lower.ult(CR.Upper))
return ConstantRange(Lower, CR.Upper);
return ConstantRange(getBitWidth(), false);
} }
if (Upper.ult(CR.Upper))
return *this;
if (Lower.ult(CR.Upper))
return ConstantRange(Lower, CR.Upper);
return ConstantRange(getBitWidth(), false);
} }
if (isWrappedSet() && !CR.isWrappedSet()) { if (isWrappedSet() && !CR.isWrappedSet()) {
@ -305,9 +293,9 @@ ConstantRange ConstantRange::intersectWith(const ConstantRange &CR) const {
if (getSetSize().ult(CR.getSetSize())) if (getSetSize().ult(CR.getSetSize()))
return *this; return *this;
else return CR;
return CR; }
} else if (CR.Lower.ult(Lower)) { if (CR.Lower.ult(Lower)) {
if (CR.Upper.ule(Lower)) if (CR.Upper.ule(Lower))
return ConstantRange(getBitWidth(), false); return ConstantRange(getBitWidth(), false);
@ -320,15 +308,15 @@ ConstantRange ConstantRange::intersectWith(const ConstantRange &CR) const {
if (CR.Lower.ult(Upper)) { if (CR.Lower.ult(Upper)) {
if (getSetSize().ult(CR.getSetSize())) if (getSetSize().ult(CR.getSetSize()))
return *this; return *this;
else return CR;
return CR;
} }
if (CR.Lower.ult(Lower)) if (CR.Lower.ult(Lower))
return ConstantRange(Lower, CR.Upper); return ConstantRange(Lower, CR.Upper);
return CR; return CR;
} else if (CR.Upper.ult(Lower)) { }
if (CR.Upper.ult(Lower)) {
if (CR.Lower.ult(Lower)) if (CR.Lower.ult(Lower))
return *this; return *this;
@ -336,8 +324,7 @@ ConstantRange ConstantRange::intersectWith(const ConstantRange &CR) const {
} }
if (getSetSize().ult(CR.getSetSize())) if (getSetSize().ult(CR.getSetSize()))
return *this; return *this;
else return CR;
return CR;
} }
@ -362,8 +349,7 @@ ConstantRange ConstantRange::unionWith(const ConstantRange &CR) const {
APInt d1 = CR.Lower - Upper, d2 = Lower - CR.Upper; APInt d1 = CR.Lower - Upper, d2 = Lower - CR.Upper;
if (d1.ult(d2)) if (d1.ult(d2))
return ConstantRange(Lower, CR.Upper); return ConstantRange(Lower, CR.Upper);
else return ConstantRange(CR.Lower, Upper);
return ConstantRange(CR.Lower, Upper);
} }
APInt L = Lower, U = Upper; APInt L = Lower, U = Upper;
@ -396,8 +382,7 @@ ConstantRange ConstantRange::unionWith(const ConstantRange &CR) const {
APInt d1 = CR.Lower - Upper, d2 = Lower - CR.Upper; APInt d1 = CR.Lower - Upper, d2 = Lower - CR.Upper;
if (d1.ult(d2)) if (d1.ult(d2))
return ConstantRange(Lower, CR.Upper); return ConstantRange(Lower, CR.Upper);
else return ConstantRange(CR.Lower, Upper);
return ConstantRange(CR.Lower, Upper);
} }
// ----U L----- : this // ----U L----- : this
@ -407,13 +392,11 @@ ConstantRange ConstantRange::unionWith(const ConstantRange &CR) const {
// ------U L---- : this // ------U L---- : this
// L-----U : CR // L-----U : CR
if (CR.Lower.ult(Upper) && CR.Upper.ult(Lower)) assert(CR.Lower.ult(Upper) && CR.Upper.ult(Lower) &&
return ConstantRange(Lower, CR.Upper); "ConstantRange::unionWith missed a case with one range wrapped");
return ConstantRange(Lower, CR.Upper);
} }
assert(isWrappedSet() && CR.isWrappedSet() &&
"ConstantRange::unionWith missed wrapped union unwrapped case");
// ------U L---- and ------U L---- : this // ------U L---- and ------U L---- : this
// -U L----------- and ------------U L : CR // -U L----------- and ------------U L : CR
if (CR.Lower.ule(Upper) || Lower.ule(CR.Upper)) if (CR.Lower.ule(Upper) || Lower.ule(CR.Upper))
@ -479,10 +462,9 @@ ConstantRange ConstantRange::zextOrTrunc(uint32_t DstTySize) const {
unsigned SrcTySize = getBitWidth(); unsigned SrcTySize = getBitWidth();
if (SrcTySize > DstTySize) if (SrcTySize > DstTySize)
return truncate(DstTySize); return truncate(DstTySize);
else if (SrcTySize < DstTySize) if (SrcTySize < DstTySize)
return zeroExtend(DstTySize); return zeroExtend(DstTySize);
else return *this;
return *this;
} }
/// sextOrTrunc - make this range have the bit width given by \p DstTySize. The /// sextOrTrunc - make this range have the bit width given by \p DstTySize. The
@ -491,10 +473,9 @@ ConstantRange ConstantRange::sextOrTrunc(uint32_t DstTySize) const {
unsigned SrcTySize = getBitWidth(); unsigned SrcTySize = getBitWidth();
if (SrcTySize > DstTySize) if (SrcTySize > DstTySize)
return truncate(DstTySize); return truncate(DstTySize);
else if (SrcTySize < DstTySize) if (SrcTySize < DstTySize)
return signExtend(DstTySize); return signExtend(DstTySize);
else return *this;
return *this;
} }
ConstantRange ConstantRange
@ -673,11 +654,10 @@ ConstantRange::lshr(const ConstantRange &Other) const {
} }
ConstantRange ConstantRange::inverse() const { ConstantRange ConstantRange::inverse() const {
if (isFullSet()) { if (isFullSet())
return ConstantRange(getBitWidth(), /*isFullSet=*/false); return ConstantRange(getBitWidth(), /*isFullSet=*/false);
} else if (isEmptySet()) { if (isEmptySet())
return ConstantRange(getBitWidth(), /*isFullSet=*/true); return ConstantRange(getBitWidth(), /*isFullSet=*/true);
}
return ConstantRange(Upper, Lower); return ConstantRange(Upper, Lower);
} }