From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 47C19385840E for ; Wed, 9 Mar 2022 23:50:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 47C19385840E Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-58-DSwmnqrMOVSg_UetQcLHpA-1; Wed, 09 Mar 2022 18:50:32 -0500 X-MC-Unique: DSwmnqrMOVSg_UetQcLHpA-1 Received: by mail-qv1-f69.google.com with SMTP id g8-20020a0cdf08000000b004354e0aa0cdso3426474qvl.17 for ; Wed, 09 Mar 2022 15:50:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BAz9JPzqTNu6IaqLJ4opezavuhJpw6KnHRz6/OSxz7o=; b=1CNJfWs6qqI0sLLP26OdjLr29JmrkCsICwCafDOa2grT6lC0Ilwa83pa4IzZ50CsEt zMrxa4Br54+Fm+dNXEoNvhSVVe8Vt93Q7fTj+Egczcs0yw+boMa4Fs/kt3ZNsjwo4kEs hJaCTFazWDHp+nybAmuxQGJH9YYX4osXFHoOONrwuuZZCKgulg6QW+Ts/BwOu+KdlPW9 VIkqq0g71v7XXb3e9QxxbJQiT5vwv9iRnrh5DkOQd8Cumhr5vtMmkyksxNrLWxHrujQP uqF9sOt5dxvXiBDbm7UYmLuGgUPChM44/gdR3ftR+fT4pJ43Ipf1ghtt2neMrxn4/53q DO+A== X-Gm-Message-State: AOAM5307z1mg9okUTn5gKIN5LYyI5N872sYZ9iEvbM7SEK2/5W0xoGH+ ND0Y/VZNBYZ4Si+VC5FzRG3U9SgYpuvOn8yZqcjn1WmQxfgjmXleTtmCabJTxqNayCT1CgJLzzO k807Yy8mtR2p7Gvc= X-Received: by 2002:a0c:be8f:0:b0:42c:5083:c6d2 with SMTP id n15-20020a0cbe8f000000b0042c5083c6d2mr1899942qvi.86.1646869831138; Wed, 09 Mar 2022 15:50:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBLVjGTDUNfsiKfKFH5mEVdOmcvolZ7CT7oLKcwxb5Hq5pfSW9LGHUsrsBaEKQmGhtdOSfSQ== X-Received: by 2002:a0c:be8f:0:b0:42c:5083:c6d2 with SMTP id n15-20020a0cbe8f000000b0042c5083c6d2mr1899933qvi.86.1646869830934; Wed, 09 Mar 2022 15:50:30 -0800 (PST) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id z19-20020a05622a029300b002e1a763dac1sm719637qtw.9.2022.03.09.15.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 15:50:30 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [committed] libstdc++: Avoid implicit narrowing from uint128_t [PR104859] Date: Wed, 9 Mar 2022 18:50:26 -0500 Message-Id: <20220309235026.903672-1-ppalka@redhat.com> X-Mailer: git-send-email 2.35.1.415.gc2162907e9 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2022 23:50:34 -0000 We need to be explicit about narrowing conversions from uint128_t since, on targets that lack __int128, this type is defined as an integer-class type that is only _explicitly_ convertible to the builtin integer types. This issue was latent until r12-7563-ge32869a17b788b made the frontend correctly reject explicit conversion functions during (dependent) copy-initialization. Tested on x86_64-pc-linux-gnu using both possible definitions of uint128 (as an alias for unsigned __int128 and as the integer-class type), committed to trunk as obvious. PR libstdc++/104859 libstdc++-v3/ChangeLog: * src/c++17/floating_to_chars.cc (__floating_to_chars_hex): Be explicit when narrowing the shifted effective_mantissa, since it may have an integer-class type. --- libstdc++-v3/src/c++17/floating_to_chars.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/src/c++17/floating_to_chars.cc b/libstdc++-v3/src/c++17/floating_to_chars.cc index 5825e661bf4..66bd457cbe2 100644 --- a/libstdc++-v3/src/c++17/floating_to_chars.cc +++ b/libstdc++-v3/src/c++17/floating_to_chars.cc @@ -801,14 +801,14 @@ template char leading_hexit; if constexpr (has_implicit_leading_bit) { - const unsigned nibble = effective_mantissa >> rounded_mantissa_bits; + const auto nibble = unsigned(effective_mantissa >> rounded_mantissa_bits); __glibcxx_assert(nibble <= 2); leading_hexit = '0' + nibble; effective_mantissa &= ~(mantissa_t{0b11} << rounded_mantissa_bits); } else { - const unsigned nibble = effective_mantissa >> (rounded_mantissa_bits-4); + const auto nibble = unsigned(effective_mantissa >> (rounded_mantissa_bits-4)); __glibcxx_assert(nibble < 16); leading_hexit = "0123456789abcdef"[nibble]; effective_mantissa &= ~(mantissa_t{0b1111} << (rounded_mantissa_bits-4)); @@ -853,7 +853,7 @@ template while (effective_mantissa != 0) { nibble_offset -= 4; - const unsigned nibble = effective_mantissa >> nibble_offset; + const auto nibble = unsigned(effective_mantissa >> nibble_offset); __glibcxx_assert(nibble < 16); *first++ = "0123456789abcdef"[nibble]; ++written_hexits; -- 2.35.1.415.gc2162907e9