- Update runtime/third_party/double-conversion to version 1.1.5.

runtime/third_party/double-conversion/src/fixed-dtoa.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 10 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <math.h>
 
 #include "fixed-dtoa.h"
-#include "double.h"
+#include "ieee.h"
 
 namespace double_conversion {
 
 // Represents a 128bit type. This class should be replaced by a native type on
 // platforms that support 128bit integers.
 class UInt128 {
  public:
   UInt128() : high_bits_(0), low_bits_(0) { }
   UInt128(uint64_t high, uint64_t low) : high_bits_(high), low_bits_(low) { }
 
@@ skipping 84 matching lines @@
   *length += requested_length;
 }
 
 
 static void FillDigits32(uint32_t number, Vector<char> buffer, int* length) {
   int number_length = 0;
   // We fill the digits in reverse order and exchange them afterwards.
   while (number != 0) {
     int digit = number % 10;
     number /= 10;
-    buffer[(*length) + number_length] = '0' + digit;
+    buffer[(*length) + number_length] = static_cast<char>('0' + digit);
     number_length++;
   }
   // Exchange the digits.
   int i = *length;
   int j = *length + number_length - 1;
   while (i < j) {
     char tmp = buffer[i];
     buffer[i] = buffer[j];
     buffer[j] = tmp;
     i++;
     j--;
   }
   *length += number_length;
 }
 
 
-static void FillDigits64FixedLength(uint64_t number, int requested_length,
+static void FillDigits64FixedLength(uint64_t number,
                                     Vector<char> buffer, int* length) {
   const uint32_t kTen7 = 10000000;
   // For efficiency cut the number into 3 uint32_t parts, and print those.
   uint32_t part2 = static_cast<uint32_t>(number % kTen7);
   number /= kTen7;
   uint32_t part1 = static_cast<uint32_t>(number % kTen7);
   uint32_t part0 = static_cast<uint32_t>(number / kTen7);
 
   FillDigits32FixedLength(part0, 3, buffer, length);
   FillDigits32FixedLength(part1, 7, buffer, length);
@@ skipping 82 matching lines @@
       // Initially we have: point <= 64 and fractionals < 2^56
       // After each iteration the point is decremented by one.
       // Note that 5^3 = 125 < 128 = 2^7.
       // Therefore three iterations of this loop will not overflow fractionals
       // (even without the subtraction at the end of the loop body). At this
       // time point will satisfy point <= 61 and therefore fractionals < 2^point
       // and any further multiplication of fractionals by 5 will not overflow.
       fractionals *= 5;
       point--;
       int digit = static_cast<int>(fractionals >> point);
-      buffer[*length] = '0' + digit;
+      ASSERT(digit <= 9);
+      buffer[*length] = static_cast<char>('0' + digit);
       (*length)++;
       fractionals -= static_cast<uint64_t>(digit) << point;
     }
     // If the first bit after the point is set we have to round up.
     if (((fractionals >> (point - 1)) & 1) == 1) {
       RoundUp(buffer, length, decimal_point);
     }
   } else {  // We need 128 bits.
     ASSERT(64 < -exponent && -exponent <= 128);
     UInt128 fractionals128 = UInt128(fractionals, 0);
     fractionals128.Shift(-exponent - 64);
     int point = 128;
     for (int i = 0; i < fractional_count; ++i) {
       if (fractionals128.IsZero()) break;
       // As before: instead of multiplying by 10 we multiply by 5 and adjust the
       // point location.
       // This multiplication will not overflow for the same reasons as before.
       fractionals128.Multiply(5);
       point--;
       int digit = fractionals128.DivModPowerOf2(point);
-      buffer[*length] = '0' + digit;
+      ASSERT(digit <= 9);
+      buffer[*length] = static_cast<char>('0' + digit);
       (*length)++;
     }
     if (fractionals128.BitAt(point - 1) == 1) {
       RoundUp(buffer, length, decimal_point);
     }
   }
 }
 
 
 // Removes leading and trailing zeros.
@@ skipping 63 matching lines @@
       // We only allow exponents of up to 20 and therefore (17 - e) <= 3
       dividend <<= exponent - divisor_power;
       quotient = static_cast<uint32_t>(dividend / divisor);
       remainder = (dividend % divisor) << divisor_power;
     } else {
       divisor <<= divisor_power - exponent;
       quotient = static_cast<uint32_t>(dividend / divisor);
       remainder = (dividend % divisor) << exponent;
     }
     FillDigits32(quotient, buffer, length);
-    FillDigits64FixedLength(remainder, divisor_power, buffer, length);
+    FillDigits64FixedLength(remainder, buffer, length);
     *decimal_point = *length;
   } else if (exponent >= 0) {
     // 0 <= exponent <= 11
     significand <<= exponent;
     FillDigits64(significand, buffer, length);
     *decimal_point = *length;
   } else if (exponent > -kDoubleSignificandSize) {
     // We have to cut the number.
     uint64_t integrals = significand >> -exponent;
     uint64_t fractionals = significand - (integrals << -exponent);
@@ skipping 21 matching lines @@
   buffer[*length] = '\0';
   if ((*length) == 0) {
     // The string is empty and the decimal_point thus has no importance. Mimick
     // Gay's dtoa and and set it to -fractional_count.
     *decimal_point = -fractional_count;
   }
   return true;
 }
 
 }  // namespace double_conversion