From 1538336836bd4f168894f295c53b329a24796c60 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Mon, 4 Feb 2019 07:01:33 -0800 Subject: [PATCH] Remove unnecessary checks --- include/fmt/format-inl.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index bb4b8423..d5a88482 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -470,7 +470,10 @@ FMT_FUNC bool grisu2_round(char* buf, int& size, int max_digits, uint64_t delta, FMT_FUNC int grisu2_gen_digits(char* buf, uint32_t hi, uint64_t lo, int& exp, uint64_t delta, const fp& one, const fp& diff, int max_digits) { - assert(exp <= 10); + // hi cannot be zero because it contains top 32 bits of a product of two + // 64-bit numbers with MSB set (due to normalization) - 1, shifted right by at + // most 60 bits. + FMT_ASSERT(hi != 0, ""); int size = 0; // Generate digits for the most significant part (hi). This can produce up to // 10 digits. @@ -522,7 +525,7 @@ FMT_FUNC int grisu2_gen_digits(char* buf, uint32_t hi, uint64_t lo, int& exp, default: FMT_ASSERT(false, "invalid number of digits"); } - if (digit != 0 || size != 0) buf[size++] = static_cast('0' + digit); + buf[size++] = static_cast('0' + digit); --exp; uint64_t remainder = (static_cast(hi) << -one.e) + lo; if (remainder <= delta || size > max_digits) { @@ -537,7 +540,7 @@ FMT_FUNC int grisu2_gen_digits(char* buf, uint32_t hi, uint64_t lo, int& exp, lo *= 10; delta *= 10; char digit = static_cast(lo >> -one.e); - if (digit != 0 || size != 0) buf[size++] = static_cast('0' + digit); + buf[size++] = static_cast('0' + digit); lo &= one.f - 1; --exp; if (lo < delta || size > max_digits) {