From patchwork Tue Nov 16 00:25:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 47735 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 767C93857805 for ; Tue, 16 Nov 2021 00:27:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 767C93857805 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1637022469; bh=E318mzVmnKdBe78N3Tnsl73pfiG8c7f0KoyeIOlyKiI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=pafabT05OBOE2nyfQrWJ9hWq2Mtiwgm91krn2EqEiaTPjdH7Q0k8Gjmbro6beIE0i 1A4TsJ4k75bvSRy4sNRWK4G70E0Wk6e6k8RG2D3DjoAmech0xCOQuL6IH2OULt55v7 gfl48QaZvDZLQor7MUcBUJy33sHR1DuWRB+pf5Dk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 7FC23385800A for ; Tue, 16 Nov 2021 00:25:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7FC23385800A Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-110-AiSkFy6HNAu4AEMnlRaj2w-1; Mon, 15 Nov 2021 19:25:19 -0500 X-MC-Unique: AiSkFy6HNAu4AEMnlRaj2w-1 Received: by mail-qk1-f197.google.com with SMTP id bp17-20020a05620a459100b0045e893f2ed8so423108qkb.11 for ; Mon, 15 Nov 2021 16:25:19 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=E318mzVmnKdBe78N3Tnsl73pfiG8c7f0KoyeIOlyKiI=; b=hfr6fSLHgL2rI+jLkXnN6V6u5Lx5x9TxITpN2BprWnbfM+e3enOburR8J5TgjANAvm 8l6hO1/er85OayO0j+vV7SjskwsJzg0SXo9OhbWrKPNnomZspdA8H1wHRT2RsJEZETwJ UjOsCsQCGM0OmxK0umXUCrMerrtzdQQKOpxdjQ5xHVFRR/aeqsOhxl8jWmtPjwZuzL+1 CSMz14X/snYq6TxXEe4f2CimrKjygptzaeX8KtqlXX2PC4u7Lxil0xU4YRS5nPbiK83Y c224W4r1WGlBng3zjYFDo57xCa1y1dW/+lFH3VqrzHJuJhyAf258e2Ko0FrOZAaXR/U2 mFvg== X-Gm-Message-State: AOAM531BgLuX00Iv8DY8zm9Sp1+tOUcALMhv7i92DV4m7kAoij+MoGqz IgtBxskfs+iEMicIWA5q+IdRwJ0vwvRD6pilZaF384pkifBz80BqO/mNvW8I3pJVE9X8xNB1SJ9 riVkDmy5OSveuLwY8ZAZOa6/6/01m4ZQh9iibWBIW3yW6easlQtRNMi5OP2Mjh6qW/vM= X-Received: by 2002:ac8:5881:: with SMTP id t1mr3338419qta.414.1637022318268; Mon, 15 Nov 2021 16:25:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9u/CiZv3eAlilayG54ULx9DBWSt/GvqivL5YcM1FN0vwjfSk1Pt3JzlyIf24AKBwCVKCjjg== X-Received: by 2002:ac8:5881:: with SMTP id t1mr3338386qta.414.1637022318000; Mon, 15 Nov 2021 16:25:18 -0800 (PST) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id j19sm7836545qkp.28.2021.11.15.16.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 16:25:17 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH 3/5] libstdc++: Adjust fast_float's over/underflow behavior for conformnace Date: Mon, 15 Nov 2021 19:25:03 -0500 Message-Id: <20211116002505.2324582-3-ppalka@redhat.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211116002505.2324582-1-ppalka@redhat.com> References: <20211116002505.2324582-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.7 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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This makes fast_float handle the situation where std::from_chars is specified to return result_out_of_range, i.e. when the parsed value is outside the representable range of the floating-point type. libstdc++-v3/ChangeLog: * src/c++17/fast_float/LOCAL_PATCHES: Update. * src/c++17/fast_float/parse_number.h (from_chars_advanced): In case of over/underflow, return errc::result_out_of_range and don't modify 'value'. --- libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES | 1 + libstdc++-v3/src/c++17/fast_float/parse_number.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES b/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES index e9d7bba6195..1f90f9d1d85 100644 --- a/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES +++ b/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES @@ -1 +1,2 @@ r12-???? +r12-???? diff --git a/libstdc++-v3/src/c++17/fast_float/parse_number.h b/libstdc++-v3/src/c++17/fast_float/parse_number.h index 86dea2287b4..57b3585c2fe 100644 --- a/libstdc++-v3/src/c++17/fast_float/parse_number.h +++ b/libstdc++-v3/src/c++17/fast_float/parse_number.h @@ -99,6 +99,16 @@ from_chars_result from_chars_advanced(const char *first, const char *last, // If we called compute_float>(pns.exponent, pns.mantissa) and we have an invalid power (am.power2 < 0), // then we need to go the long way around again. This is very uncommon. if(am.power2 < 0) { am = digit_comp(pns, am); } + + if((pns.mantissa != 0 && am.mantissa == 0 && am.power2 == 0) || am.power2 == binary_format::infinite_power()) { + // In case of over/underflow, return result_out_of_range and don't modify value, + // as per [charconv.from.chars]/1. + // + // If LWG 3081 gets adopted, then we'll need to call to_float in this case too. + answer.ec = std::errc::result_out_of_range; + return answer; + } + to_float(pns.negative, am, value); return answer; }