From patchwork Mon Jun 14 22:41:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= X-Patchwork-Id: 1491893 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=PhXtJWuC; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G3mfC2BTVz9sW6 for ; Tue, 15 Jun 2021 08:41:54 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 841053857428 for ; Mon, 14 Jun 2021 22:41:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 841053857428 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1623710511; bh=jlj3iez833qxGnIi5prOX9k5CxItf+VYzrdolrBNnVM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PhXtJWuCe9wh7/9U6qalsZDMkX+MJCX0wMqFx+7D/lZ2Lvqoc+yAKYfY6Ee3uDTnM uUvKXfC95/RIVS/vPD6xAP98mSBt7j8IeQ+snFRKJQ67M0CjW2lqII8/OBWUdFusZP S0G1oz6+M5I6Mkh/hiGSaNm1AnzHfiYjsrkc2Mss= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id EDD7F3857428; Mon, 14 Jun 2021 22:41:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EDD7F3857428 Received: by mail-wm1-x336.google.com with SMTP id k5-20020a05600c1c85b02901affeec3ef8so450561wms.0; Mon, 14 Jun 2021 15:41:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=jlj3iez833qxGnIi5prOX9k5CxItf+VYzrdolrBNnVM=; b=SWtotLW5oN++35W0hwn3wW48SXWaMnmoRIdS2aRz6HmHJJI8mZrc4kDgx7PYbnNOzY 52Rh3+mcfL3OPtglW+1wy2Z+P4L80TvhsI1iP6p5QO3i1KQNw9rjkJnZAbEmuEJDVEBX cLdiWQ+SBXQft0YwwwqL3keWQimKkw19lnKa4BksPetY7TT81LbWWMECc7hyvNh6RLOs ETVwXvRabQy3TU/UobtC3dlm3XfkYh8u3mR59kzfATVSkuIoRsgDObfHbieHKpqpHqwI H2ASk3vxwGkISwVv+E5q34C2Cg9EmaOMplTdKcmBckeV2aK6AhxMKv05nqDMx1yTbjtP JSUQ== X-Gm-Message-State: AOAM533J4E40n1uxypgGH9q97+0gjl+YGV54tc2Rd3yNiRGWcNb4SKY8 DiZ0zHcazrnXMCGe5xAaDkMqRlo2LvY= X-Google-Smtp-Source: ABdhPJwmIb3No+7guWgBAefNQS38IqDTlFNf76KqfNhN7/7DU2SXa/jCck9mrr9JpAOLjPEervWiTg== X-Received: by 2002:a05:600c:5128:: with SMTP id o40mr1450908wms.43.1623710466733; Mon, 14 Jun 2021 15:41:06 -0700 (PDT) Received: from ?IPv6:2001:8a0:7d79:6000:7d63:4f76:b234:4d55? ([2001:8a0:7d79:6000:7d63:4f76:b234:4d55]) by smtp.googlemail.com with ESMTPSA id n20sm13868211wmk.12.2021.06.14.15.41.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Jun 2021 15:41:05 -0700 (PDT) To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [Patch, fortran] PR fortran/94104 - Request for diagnostic improvement Message-ID: <6268dc85-3e26-5ae9-e508-3bbfd0d80ae2@gmail.com> Date: Mon, 14 Jun 2021 22:41:05 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-12.1 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa_via_Gcc-patches?= From: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= Reply-To: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi all! Proposed patch to: Bug 94104 - Request for diagnostic improvement Patch tested only on x86_64-pc-linux-gnu. Error message improvement. In Fortran 2008 actual arguments to procedures having a pointer, with intent attribute in, formal argument can also have the target attribute not just pointer. Thank you very much. Best regards, José Rui Fortran: error message improvement. PR fortran/94104 gcc/fortran/ChangeLog: * interface.c (gfc_compare_actual_formal): improve error message. gcc/testsuite/ChangeLog: * gfortran.dg/parens_2.f90: update regex. * gfortran.dg/PR94104a.f90: New test. * gfortran.dg/PR94104b.f90: New test. diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 9e3e8aa..4cc0708 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -3329,26 +3329,38 @@ gfc_compare_actual_formal (gfc_actual_arglist **ap, gfc_formal_arglist *formal, return false; } - if (a->expr->expr_type != EXPR_NULL - && compare_pointer (f->sym, a->expr) == 0) + if (a->expr->expr_type != EXPR_NULL) { - if (where) - gfc_error ("Actual argument for %qs must be a pointer at %L", - f->sym->name, &a->expr->where); - return false; - } + int cmp = compare_pointer (f->sym, a->expr); + bool pre2008 = ((gfc_option.allow_std & GFC_STD_F2008) == 0); + + if (pre2008 && cmp == 0) + { + if (where) + gfc_error ("Actual argument for %qs at %L must be a pointer.", + f->sym->name, &a->expr->where); + return false; + } + + if (pre2008 && cmp == 2) + { + if (where) + gfc_error ("Fortran 2008: Non-pointer actual argument at %L to " + "pointer dummy %qs", &a->expr->where,f->sym->name); + return false; + } - if (a->expr->expr_type != EXPR_NULL - && (gfc_option.allow_std & GFC_STD_F2008) == 0 - && compare_pointer (f->sym, a->expr) == 2) - { - if (where) - gfc_error ("Fortran 2008: Non-pointer actual argument at %L to " - "pointer dummy %qs", &a->expr->where,f->sym->name); - return false; + if (!pre2008 && cmp == 0) + { + if (where) + gfc_error ("Actual argument for %qs at %L must be a pointer " + "or a valid target for the dummy pointer in a " + "pointer assignment statement.", + f->sym->name, &a->expr->where); + return false; + } } - /* Fortran 2008, C1242. */ if (f->sym->attr.pointer && gfc_is_coindexed (a->expr)) { diff --git a/gcc/testsuite/gfortran.dg/PR94104a.f90 b/gcc/testsuite/gfortran.dg/PR94104a.f90 new file mode 100644 index 0000000..acde7fe --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR94104a.f90 @@ -0,0 +1,35 @@ +! { dg-do compile } +! { dg-options "-std=f2003" } +! { dg-shouldfail "Actual argument" } +! +! PR fortran/94104 +! + +program diag_p + + implicit none + + integer, parameter :: n = 7 + + integer :: a(n) + integer, target :: b(n) + + a = 1 + print *, sumf(a) ! { dg-error "Actual argument for 'a' at .1. must be a pointer\\." } + print *, sumf(b) ! { dg-error "Fortran 2008: Non-pointer actual argument at .1. to pointer dummy 'a'" } + stop + +contains + + function sumf(a) result(s) + integer, pointer, intent(in) :: a(:) + + integer :: s + + s = sum(a) + return + end function sumf + +end program diag_p + + diff --git a/gcc/testsuite/gfortran.dg/PR94104b.f90 b/gcc/testsuite/gfortran.dg/PR94104b.f90 new file mode 100644 index 0000000..5018da9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR94104b.f90 @@ -0,0 +1,35 @@ +! { dg-do compile } +! { dg-options "-std=f2008" } +! { dg-shouldfail "Actual argument" } +! +! PR fortran/94104 +! + +program diag_p + + implicit none + + integer, parameter :: n = 7 + + integer :: a(n) + integer, target :: b(n) + + a = 1 + print *, sumf(a) ! { dg-error "Actual argument for 'a' at .1. must be a pointer or a valid target" } + print *, sumf(b) + stop + +contains + + function sumf(a) result(s) + integer, pointer, intent(in) :: a(:) + + integer :: s + + s = sum(a) + return + end function sumf + +end program diag_p + + diff --git a/gcc/testsuite/gfortran.dg/parens_2.f90 b/gcc/testsuite/gfortran.dg/parens_2.f90 index bc2acd8..dc5965d 100644 --- a/gcc/testsuite/gfortran.dg/parens_2.f90 +++ b/gcc/testsuite/gfortran.dg/parens_2.f90 @@ -2,7 +2,7 @@ ! { dg-do compile } ! Originally contributed by Joost VandeVondele INTEGER, POINTER :: I -CALL S1((I)) ! { dg-error "Actual argument for .i. must be a pointer" } +CALL S1((I)) ! { dg-error "Actual argument for .i. at .1. must be a pointer or a valid target" } CONTAINS SUBROUTINE S1(I) INTEGER, POINTER ::I