[ConstantFPRange] Fix conflits after rebasing

Author: dtcxzyw

llvm/include/llvm/IR/ConstantFPRange.h

@@ -217,22 +217,6 @@ class [[nodiscard]] ConstantFPRange {
   /// range of operands/results.
   LLVM_ABI ConstantFPRange getWithoutInf() const;
 
-  /// Calculate absolute value range.
-  LLVM_ABI ConstantFPRange abs() const;
-
-  /// Calculate range of negated values.
-  LLVM_ABI ConstantFPRange negate() const;
-
-  /// Get the range without NaNs. It is useful when we apply nnan flag to range
-  /// of operands/results.
-  ConstantFPRange getWithoutNaN() const {
-    return ConstantFPRange(Lower, Upper, false, false);
-  }
-
-  /// Get the range without infinities. It is useful when we apply ninf flag to
-  /// range of operands/results.
-  LLVM_ABI ConstantFPRange getWithoutInf() const;
-
   /// Return a new range in the specified format with the specified rounding
   /// mode.
   LLVM_ABI ConstantFPRange

llvm/lib/IR/ConstantFPRange.cpp

@@ -428,40 +428,6 @@ ConstantFPRange ConstantFPRange::getWithoutInf() const {
                          MayBeSNaN);
 }
 
-ConstantFPRange ConstantFPRange::abs() const {
-  if (isNaNOnly())
-    return *this;
-  // Check if the range is all non-negative or all non-positive.
-  if (Lower.isNegative() == Upper.isNegative()) {
-    if (Lower.isNegative())
-      return negate();
-    return *this;
-  }
-  // The range contains both positive and negative values.
-  APFloat NewLower = APFloat::getZero(getSemantics());
-  APFloat NewUpper = maxnum(-Lower, Upper);
-  return ConstantFPRange(std::move(NewLower), std::move(NewUpper), MayBeQNaN,
-                         MayBeSNaN);
-}
-
-ConstantFPRange ConstantFPRange::negate() const {
-  return ConstantFPRange(-Upper, -Lower, MayBeQNaN, MayBeSNaN);
-}
-
-ConstantFPRange ConstantFPRange::getWithoutInf() const {
-  if (isNaNOnly())
-    return *this;
-  APFloat NewLower = Lower;
-  APFloat NewUpper = Upper;
-  if (Lower.isNegInfinity())
-    NewLower = APFloat::getLargest(getSemantics(), /*Negative=*/true);
-  if (Upper.isPosInfinity())
-    NewUpper = APFloat::getLargest(getSemantics(), /*Negative=*/false);
-  canonicalizeRange(NewLower, NewUpper);
-  return ConstantFPRange(std::move(NewLower), std::move(NewUpper), MayBeQNaN,
-                         MayBeSNaN);
-}
-
 ConstantFPRange ConstantFPRange::cast(const fltSemantics &DstSem,
                                       APFloat::roundingMode RM) const {
   bool LosesInfo;