From patchwork Mon Nov 18 20:34:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Blomqvist X-Patchwork-Id: 1196958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-513959-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="xwcvm8ci"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BErMjXY9"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47H11N6Hgmz9s4Y for ; Tue, 19 Nov 2019 07:35:36 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=v6cljMyosc0Z5x4DKtNqTsCxk+aWQzqZ43iGmcuVbB2WW6N+cOrlK QdndsHxpBGiFB3fLrL3ipgeFZahzP3btOGoncsoTp6/0UipJ1NBy7wYojTtrkkvA bIfGpWfkTxfU1zRjXOff0Qlf6kSD7enzche4ZM0oHErAO2ErYI/WyY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=sAiZfIB38H144EaJF1XnTvv2h0M=; b=xwcvm8cirqG4R9DivJjZ 5eT3foUc4OM10h7orElT/mvoUjcX2mIAVidqTX/YGb04PbQs2bMfhZU1/lO1lGz/ 1iXio91fk53NN2/y79RxS/ZDVN4Je3NjnJ2WM8PRXZ0TkeC7NVx/54CnPOK1uW83 mQfqSwYWNxN+aiAC1Ad/KD8= Received: (qmail 122151 invoked by alias); 18 Nov 2019 20:35:15 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 122100 invoked by uid 89); 18 Nov 2019 20:35:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=accidental X-HELO: mail-lj1-f196.google.com Received: from mail-lj1-f196.google.com (HELO mail-lj1-f196.google.com) (209.85.208.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 18 Nov 2019 20:35:12 +0000 Received: by mail-lj1-f196.google.com with SMTP id k15so20536512lja.3; Mon, 18 Nov 2019 12:35:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ppHhl9okiFnvzRVco648Y2BfIXaDoXmpwo+mzfUfDMs=; b=BErMjXY99rfpChmMO2YdCsJtx1X6pcDAOykGoQt/YymwNDXtUiejz0XSkX54HLQPR2 U/UveFu6nM+tD/c2PJd1c4lN88yTbn4bbjoow3rwVPaeR+GL+5PEkwKlZxOXHNrCgBQB Jexg8GNywYXbBEkEoVg4/OPDIUvgM7/k88rZicVcdQeh7Om7Xv4ZgWAqNVXoXdEaYG+Q NNEFRgEP/R27yCZhguKCtB24blSsPRGtZ5ha8BfSWUcjLLVECDGTCaQMflx30hsP+coS qL21NSnn3xmqAlYyaS8sokaZV03M3jzGSwc+AAmhZbh7lJsBBcUuQ8Wj0rIqcEmhoj6k oeFw== Received: from ws.lan (88-114-247-254.elisa-laajakaista.fi. [88.114.247.254]) by smtp.gmail.com with ESMTPSA id p18sm9615745lfh.24.2019.11.18.12.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 12:35:09 -0800 (PST) From: Janne Blomqvist To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Janne Blomqvist Subject: [PATCH 2/2] PR 92463 MPFR modernization: Revert r269139 Date: Mon, 18 Nov 2019 22:34:50 +0200 Message-Id: <20191118203450.8277-2-blomqvist.janne@gmail.com> In-Reply-To: <20191118203450.8277-1-blomqvist.janne@gmail.com> References: <20191118203450.8277-1-blomqvist.janne@gmail.com> Commit r269139 fixed an accidental dependency on MPFR 3.0. As we now require at least MPFR 3.1.0+ we can revert it and instead use the simpler MPFR 3.0+ code. ChangeLog entry of the original commit was: 2019-02-23 David Malcolm Jakub Jelinek PR middle-end/88074 * simplify.c (norm2_do_sqrt, gfc_simplify_norm2): Use mpfr_number_p && !mpfr_zero_p instead of mpfr_regular_p. (norm2_add_squared): Likewise. Use mp_exp_t rather than mpfr_exp_t. --- gcc/fortran/simplify.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index a5c940ca2d5..b48bf014121 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -6023,8 +6023,8 @@ norm2_add_squared (gfc_expr *result, gfc_expr *e) gfc_set_model_kind (result->ts.kind); int index = gfc_validate_kind (BT_REAL, result->ts.kind, false); - mp_exp_t exp; - if (mpfr_number_p (result->value.real) && !mpfr_zero_p (result->value.real)) + mpfr_exp_t exp; + if (mpfr_regular_p (result->value.real)) { exp = mpfr_get_exp (result->value.real); /* If result is getting close to overflowing, scale down. */ @@ -6038,7 +6038,7 @@ norm2_add_squared (gfc_expr *result, gfc_expr *e) } mpfr_init (tmp); - if (mpfr_number_p (e->value.real) && !mpfr_zero_p (e->value.real)) + if (mpfr_regular_p (e->value.real)) { exp = mpfr_get_exp (e->value.real); /* If e**2 would overflow or close to overflowing, scale down. */ @@ -6079,9 +6079,7 @@ norm2_do_sqrt (gfc_expr *result, gfc_expr *e) if (result != e) mpfr_set (result->value.real, e->value.real, GFC_RND_MODE); mpfr_sqrt (result->value.real, result->value.real, GFC_RND_MODE); - if (norm2_scale - && mpfr_number_p (result->value.real) - && !mpfr_zero_p (result->value.real)) + if (norm2_scale && mpfr_regular_p (result->value.real)) { mpfr_t tmp; mpfr_init (tmp); @@ -6120,9 +6118,7 @@ gfc_simplify_norm2 (gfc_expr *e, gfc_expr *dim) result = simplify_transformation_to_scalar (result, e, NULL, norm2_add_squared); mpfr_sqrt (result->value.real, result->value.real, GFC_RND_MODE); - if (norm2_scale - && mpfr_number_p (result->value.real) - && !mpfr_zero_p (result->value.real)) + if (norm2_scale && mpfr_regular_p (result->value.real)) { mpfr_t tmp; mpfr_init (tmp);