From 72c55146bb505642994637071b305bf4d30ef685 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Sat, 6 Feb 2016 10:28:36 -0800 Subject: Fix incorrect casts. gold/ PR gold/19577 * reloc.h (Bits::has_unsigned_overflow32): Fix static_cast. (Bits::has_unsigned_overflow): Remove unnecessary static_cast. --- gold/ChangeLog | 6 ++++++ gold/reloc.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'gold') diff --git a/gold/ChangeLog b/gold/ChangeLog index ba0b973..a8184fc 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,6 +1,12 @@ 2016-02-06 Cary Coutant PR gold/19577 + * reloc.h (Bits::has_unsigned_overflow32): Fix static_cast. + (Bits::has_unsigned_overflow): Remove unnecessary static_cast. + +2016-02-06 Cary Coutant + + PR gold/19577 * reloc.h (Bits::has_unsigned_overflow32): Fix unsigned/signed comparison. (Bits::has_unsigned_overflow): Likewise. diff --git a/gold/reloc.h b/gold/reloc.h index fce7313..9c09c7c 100644 --- a/gold/reloc.h +++ b/gold/reloc.h @@ -1015,7 +1015,7 @@ class Bits gold_assert(bits > 0 && bits <= 32); if (bits == 32) return false; - uint32_t max = static_cast((1U << bits) - 1); + uint32_t max = static_cast((1U << bits) - 1); return val > max; } @@ -1081,7 +1081,7 @@ class Bits gold_assert(bits > 0 && bits <= 64); if (bits == 64) return false; - uint64_t max = static_cast((static_cast(1) << bits) - 1); + uint64_t max = (static_cast(1) << bits) - 1; return val > max; } -- cgit v1.1