From patchwork Wed Oct 27 21:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Reutner-Fischer X-Patchwork-Id: 46721 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 5AC133858034 for ; Wed, 27 Oct 2021 21:30:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AC133858034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1635370232; bh=Odo6vcZqv9iyjythMjrIp/W4mt0ygCvsu4ulgZrznwM=; 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=eJJ8fqQriy1urXoS+PvbsU/k/lN+ze+rpRTJw01Epneu8LctQbsu2Fc+nDXWUENh9 SOy1QQrvDdg0y8YCoV/h6jMWNuAfYDejnnEmvUiSa1uY8MvmFeylqz9sZbGtYshXTh VaD5dH7bkzoVj73cMb2jK9j8usn2wxBUoZC8xEiE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 16EE33858C27; Wed, 27 Oct 2021 21:29:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 16EE33858C27 Received: by mail-wm1-x331.google.com with SMTP id z200so3014267wmc.1; Wed, 27 Oct 2021 14:29:46 -0700 (PDT) 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=Odo6vcZqv9iyjythMjrIp/W4mt0ygCvsu4ulgZrznwM=; b=bJNDEqpWiCuUncBrA0QIwV9vMJCcAC3Wt3TqU9O3tP/H6fCvQB5qOzbLkBaVx8CcgJ A9LD+ER9mkEeN2ZnRExssYpuY+hunQ/O/OizC2Ku/8SYRqAS0hXgr2rLakaie7FWPhXp 2DBHQto4Can44ev9/hMziVaBGsqMZMehctli19eZpZIvIEKEwjYNCjlZsWTOOQsuB4L/ xiSaa3xIQHM1OwhP+OplF1wiDXHlsO9rxQHFCAA9alSTytK/P6oT7TE03M7pcWieybFL pa7namwZ5QJX74LbaH8NLorwZNwx3UnXQOHOB5fZK5ERT44FDZQVdVciBuePDeq0tORb sNwA== X-Gm-Message-State: AOAM532WVK3Ws2/2CNezcYw27L8VF/MY6hC3fJwdM44+Axi7WhPfnQuT FzgDzjJZMkrwiZigBuoy59Y= X-Google-Smtp-Source: ABdhPJz+QAyu7BOo+80B+QtZCJLJtD4vPkjPkyz566B+zruXpsDSh1KUyoD1ww4J2VKSxKgw6QyrMQ== X-Received: by 2002:a1c:f008:: with SMTP id a8mr8333261wmb.140.1635370185096; Wed, 27 Oct 2021 14:29:45 -0700 (PDT) Received: from nbbrfq.weghof (dynamic-2bq7di4u2lfl4qjka9-pd01.res.v6.highway.a1.net. [2001:871:227:33a8:f6a3:c58c:7641:e771]) by smtp.gmail.com with ESMTPSA id k10sm4479203wmr.32.2021.10.27.14.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 14:29:44 -0700 (PDT) Received: from b by nbbrfq.weghof with local (Exim 4.95) (envelope-from ) id 1mfqUR-001IcC-B6; Wed, 27 Oct 2021 23:29:43 +0200 To: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Subject: [PATCH,Fortran 1/1] Tweak locations around CAF simplify Date: Wed, 27 Oct 2021 23:29:41 +0200 Message-Id: <20211027212941.309870-2-rep.dot.nop@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211027212941.309870-1-rep.dot.nop@gmail.com> References: <20211027212941.309870-1-rep.dot.nop@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: 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: Bernhard Reutner-Fischer via Gcc-patches From: Bernhard Reutner-Fischer Reply-To: Bernhard Reutner-Fischer Cc: Bernhard Reutner-Fischer Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Bernhard Reutner-Fischer addresses: FIXME: gfc_current_locus is wrong by using the locus of the current intrinsic. Regtests clean, ok for trunk? gcc/fortran/ChangeLog: 2018-09-20 Bernhard Reutner-Fischer * simplify.c (gfc_simplify_failed_or_stopped_images): Use current intrinsic where locus. (gfc_simplify_get_team): Likewise. (gfc_simplify_num_images): Likewise. (gfc_simplify_image_status): Likewise. (gfc_simplify_this_image): Likewise. --- gcc/fortran/simplify.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index d675f2c3aef..46e88bb2bf1 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -2985,8 +2985,9 @@ gfc_simplify_failed_or_stopped_images (gfc_expr *team ATTRIBUTE_UNUSED, { if (flag_coarray == GFC_FCOARRAY_NONE) { - gfc_current_locus = *gfc_current_intrinsic_where; - gfc_fatal_error ("Coarrays disabled at %C, use %<-fcoarray=%> to enable"); + gfc_fatal_error ("Coarrays disabled at %L, use %<-fcoarray=%> to enable", + gfc_current_intrinsic_where); + return &gfc_bad_expr; } @@ -2999,7 +3000,8 @@ gfc_simplify_failed_or_stopped_images (gfc_expr *team ATTRIBUTE_UNUSED, else actual_kind = gfc_default_integer_kind; - result = gfc_get_array_expr (BT_INTEGER, actual_kind, &gfc_current_locus); + result = gfc_get_array_expr (BT_INTEGER, actual_kind, + gfc_current_intrinsic_where); result->rank = 1; return result; } @@ -3015,15 +3017,16 @@ gfc_simplify_get_team (gfc_expr *level ATTRIBUTE_UNUSED) { if (flag_coarray == GFC_FCOARRAY_NONE) { - gfc_current_locus = *gfc_current_intrinsic_where; - gfc_fatal_error ("Coarrays disabled at %C, use %<-fcoarray=%> to enable"); + gfc_fatal_error ("Coarrays disabled at %L, use %<-fcoarray=%> to enable", + gfc_current_intrinsic_where); return &gfc_bad_expr; } if (flag_coarray == GFC_FCOARRAY_SINGLE) { gfc_expr *result; - result = gfc_get_array_expr (BT_INTEGER, gfc_default_integer_kind, &gfc_current_locus); + result = gfc_get_array_expr (BT_INTEGER, gfc_default_integer_kind, + gfc_current_intrinsic_where); result->rank = 0; return result; } @@ -6340,7 +6343,8 @@ gfc_simplify_num_images (gfc_expr *distance ATTRIBUTE_UNUSED, gfc_expr *failed) if (flag_coarray == GFC_FCOARRAY_NONE) { - gfc_fatal_error ("Coarrays disabled at %C, use %<-fcoarray=%> to enable"); + gfc_fatal_error ("Coarrays disabled at %L, use %<-fcoarray=%> to enable", + gfc_current_intrinsic_where); return &gfc_bad_expr; } @@ -6350,9 +6354,8 @@ gfc_simplify_num_images (gfc_expr *distance ATTRIBUTE_UNUSED, gfc_expr *failed) if (failed && failed->expr_type != EXPR_CONSTANT) return NULL; - /* FIXME: gfc_current_locus is wrong. */ result = gfc_get_constant_expr (BT_INTEGER, gfc_default_integer_kind, - &gfc_current_locus); + gfc_current_intrinsic_where); if (failed && failed->value.logical != 0) mpz_set_si (result->value.integer, 0); @@ -8345,8 +8348,8 @@ gfc_simplify_image_status (gfc_expr *image, gfc_expr *team ATTRIBUTE_UNUSED) { if (flag_coarray == GFC_FCOARRAY_NONE) { - gfc_current_locus = *gfc_current_intrinsic_where; - gfc_fatal_error ("Coarrays disabled at %C, use %<-fcoarray=%> to enable"); + gfc_fatal_error ("Coarrays disabled at %L, use %<-fcoarray=%> to enable", + gfc_current_intrinsic_where); return &gfc_bad_expr; } @@ -8383,9 +8386,8 @@ gfc_simplify_this_image (gfc_expr *coarray, gfc_expr *dim, if (coarray == NULL || !gfc_is_coarray (coarray)) { gfc_expr *result; - /* FIXME: gfc_current_locus is wrong. */ result = gfc_get_constant_expr (BT_INTEGER, gfc_default_integer_kind, - &gfc_current_locus); + gfc_current_intrinsic_where); mpz_set_si (result->value.integer, 1); return result; }