Bug 1245414, part 8 - Remove mfbt/decimal/floor-ceiling.patch now that the issue is fixed upstream. r=Waldo

This commit is contained in:
Jonathan Watt 2016-02-11 19:07:42 +00:00
parent 88c1e66f99
commit 9c566fe3ef
2 changed files with 0 additions and 90 deletions

View File

@ -1,89 +0,0 @@
diff --git a/mfbt/decimal/Decimal.cpp b/mfbt/decimal/Decimal.cpp
--- a/mfbt/decimal/Decimal.cpp
+++ b/mfbt/decimal/Decimal.cpp
@@ -618,26 +618,26 @@ Decimal::AlignedOperands Decimal::alignO
Decimal Decimal::ceiling() const
{
if (isSpecial())
return *this;
if (exponent() >= 0)
return *this;
- uint64_t result = m_data.coefficient();
- const int numberOfDigits = countDigits(result);
+ uint64_t coefficient = m_data.coefficient();
+ const int numberOfDigits = countDigits(coefficient);
const int numberOfDropDigits = -exponent();
if (numberOfDigits < numberOfDropDigits)
return isPositive() ? Decimal(1) : zero(Positive);
- result = scaleDown(result, numberOfDropDigits - 1);
- if (sign() == Positive && result % 10 > 0)
- result += 10;
- result /= 10;
+ uint64_t result = scaleDown(coefficient, numberOfDropDigits);
+ uint64_t droppedDigits = coefficient - scaleUp(result, numberOfDropDigits);
+ if (droppedDigits && isPositive())
+ result += 1;
return Decimal(sign(), 0, result);
}
Decimal Decimal::compareTo(const Decimal& rhs) const
{
const Decimal result(*this - rhs);
switch (result.m_data.formatClass()) {
case EncodedData::ClassInfinity:
@@ -660,26 +660,27 @@ Decimal Decimal::compareTo(const Decimal
Decimal Decimal::floor() const
{
if (isSpecial())
return *this;
if (exponent() >= 0)
return *this;
- uint64_t result = m_data.coefficient();
- const int numberOfDigits = countDigits(result);
+ uint64_t coefficient = m_data.coefficient();
+ const int numberOfDigits = countDigits(coefficient);
const int numberOfDropDigits = -exponent();
if (numberOfDigits < numberOfDropDigits)
return isPositive() ? zero(Positive) : Decimal(-1);
- result = scaleDown(result, numberOfDropDigits - 1);
- if (isNegative() && result % 10 > 0)
- result += 10;
- result /= 10;
+ uint64_t result = scaleDown(coefficient, numberOfDropDigits);
+ uint64_t droppedDigits = coefficient - scaleUp(result, numberOfDropDigits);
+ if (droppedDigits && isNegative()) {
+ result += 1;
+ }
return Decimal(sign(), 0, result);
}
Decimal Decimal::fromDouble(double doubleValue)
{
if (std::isfinite(doubleValue))
return fromString(String::numberToStringECMAScript(doubleValue));
@@ -915,16 +916,18 @@ Decimal Decimal::round() const
return *this;
uint64_t result = m_data.coefficient();
const int numberOfDigits = countDigits(result);
const int numberOfDropDigits = -exponent();
if (numberOfDigits < numberOfDropDigits)
return zero(Positive);
+ // We're implementing round-half-away-from-zero, so we only need the one
+ // (the most significant) fractional digit:
result = scaleDown(result, numberOfDropDigits - 1);
if (result % 10 >= 5)
result += 10;
result /= 10;
return Decimal(sign(), 0, result);
}
double Decimal::toDouble() const

View File

@ -49,7 +49,6 @@ fi
# Apply patches:
patch -p3 < floor-ceiling.patch
patch -p3 < zero-serialization.patch
patch -p3 < comparison-with-nan.patch
patch -p3 < mfbt-abi-markers.patch