From patchwork Thu Jan 2 17:47:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1217122 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-516585-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="o/jJATp3"; 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 47pbBN2NS3z9sPJ for ; Fri, 3 Jan 2020 04:48:58 +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:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=DMkNFGFXB6dsAHSNPt6GwVrCQuyz77G5t+MKYkk0Zm2S2G3ten 5HVMVQOGGdcgNxmbJqF2WkxuooO4wIHTuYV5bChOj2VaBZ0aKm810K1FAVGKDO9d Tv+H8etpCXcF8QJrxLCTOWWDU6hQ9OkhQvxiJ44OZBeQPfR+thVNKdcgE= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=DlTfS4IjNYH0DTTeuDJLDlCtL/4=; b=o/jJATp3rmNPDMnCeORL yq2B3j5bjHXvsl/IMxFozMYTgL/N4b3lbBuqqNqc/15B6cTRS8JbH8AIXJHUZtov SMFK8K84mvXXQP0nwDS3WmaO6k5gddzhc4m1RpsBhfdadQIL7mgmN3l+j0lkwp0s 5mkt2M7hzEsLYo9mld3vM3s= Received: (qmail 70293 invoked by alias); 2 Jan 2020 17:48:45 -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 70091 invoked by uid 89); 2 Jan 2020 17:48:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.9 required=5.0 tests=AWL, BAYES_00, GARBLED_SUBJECT, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=association X-HELO: esa1.mentor.iphmx.com Received: from esa1.mentor.iphmx.com (HELO esa1.mentor.iphmx.com) (68.232.129.153) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 02 Jan 2020 17:48:20 +0000 IronPort-SDR: 4KGyMnw4iAZxWnE2zoGekZ7IMB/mbZk/SZ3cAljRRl81EbuIdekGQHHn95v4zn/8cXBKbjiMCE 3j7sdksDmvGCCeBEBXPhaO6L8+Vm9SP2doh02+OMvC+9efelcunobMKmnvdfBPmMpGkQj92Z1J uwX8OZYYvzaPg38gGLmUx3b1X90sJMjb++BgK+QThXfp6FMF3iAx8+XRKAQD4Ik74lOvzmF5W7 +FF/HTYzsOQZxvsOWKhieFdKpQ6R6CACW3mu8Rf56NDJk4xTlhNpoNRKBlL8oxoQyZHqxtR45z Wks= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 02 Jan 2020 09:48:08 -0800 IronPort-SDR: sQ4E31H2NlCtM1INlCWFayur6DVeKDaIjXVZQ8St9qIw8evNkmCebfSWXaf9K2j7QZKIzCICFk Mp20UyV36sFR++AY2FFMHi4trP90vkegVvJsXQ9+jKZFDsf5IXjWtsPXP20n2wUf+GMQVXUYzD wNiWEiwaKecoM02lfkBSsCmXgzMjKlJNGRPsLscC+ip/sU0eMYB1Paiperaac6rOuJBPC3HUdQ Nsp3TYSmE/mlyAK/YbE9I5lBa7hunWDqWiHZvA2IOFLCz94KFhynLxH6UkrWtlSnL9fwb9iqwj I20= To: gcc-patches , fortran From: Tobias Burnus Subject: =?utf-8?q?=5BPatch=2C_Fortran=5D_PR_92994_=E2=80=93_add_more_ASS?= =?utf-8?q?OCIATE_checks?= Message-ID: <5a9add50-ab21-707b-7ea0-611d83017e91@codesourcery.com> Date: Thu, 2 Jan 2020 18:47:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 X-IsSubscribed: yes Add some more checks for invalid use for the RHS in proc-pointer assignments and for ASSOCIATE targets (which uses the latter if the previous match failed). Build on x86-64-gnu-linux. OK for the trunk? Tobias PR fortran/92994 * primary.c (gfc_match_rvalue): Add some flavor checks gfc_matching_procptr_assignment. * resolve.c (resolve_assoc_var): Add more checks for invalid targets. PR fortran/92994 * gfortran.dg/associate_50.f90: Update dg-error. * gfortran.dg/associate_51.f90: New. gcc/fortran/primary.c | 14 +++++++- gcc/fortran/resolve.c | 21 ++++++++++-- gcc/testsuite/gfortran.dg/associate_50.f90 | 4 +-- gcc/testsuite/gfortran.dg/associate_51.f90 | 54 ++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 189b904527e..e2b6fcb2106 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -3447,7 +3447,19 @@ gfc_match_rvalue (gfc_expr **result) } if (gfc_matching_procptr_assignment) - goto procptr0; + { + /* It can be a procedure or a derived-type procedure or a not-yet-known + type. */ + if (sym->attr.flavor != FL_UNKNOWN + && sym->attr.flavor != FL_PROCEDURE + && sym->attr.flavor != FL_PARAMETER + && sym->attr.flavor != FL_VARIABLE) + { + gfc_error ("Symbol at %C is not appropriate for an expression"); + return MATCH_ERROR; + } + goto procptr0; + } if (sym->attr.function || sym->attr.external || sym->attr.intrinsic) goto function0; diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 4aa5f1b568a..6f2a4c4d65a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -8836,9 +8836,20 @@ resolve_assoc_var (gfc_symbol* sym, bool resolve_target) gcc_assert (target->symtree); tsym = target->symtree->n.sym; - if (tsym->attr.flavor == FL_PROGRAM) + + if (tsym->attr.subroutine + || tsym->attr.external + || (tsym->attr.function + && (tsym->result != tsym || tsym->attr.recursive))) { - gfc_error ("Associating entity %qs at %L is a PROGRAM", + gfc_error ("Associating entity %qs at %L is a procedure name", + tsym->name, &target->where); + return; + } + + if (gfc_expr_attr (target).proc_pointer) + { + gfc_error ("Associating entity %qs at %L is a procedure pointer", tsym->name, &target->where); return; } @@ -8851,6 +8862,12 @@ resolve_assoc_var (gfc_symbol* sym, bool resolve_target) if (is_subref_array (target)) sym->attr.subref_array_pointer = 1; } + else if (target->ts.type == BT_PROCEDURE) + { + gfc_error ("Associating selector-expression at %L yields a procedure", + &target->where); + return; + } if (target->expr_type == EXPR_NULL) { diff --git a/gcc/testsuite/gfortran.dg/associate_50.f90 b/gcc/testsuite/gfortran.dg/associate_50.f90 index d759db59b29..990ec58bffe 100644 --- a/gcc/testsuite/gfortran.dg/associate_50.f90 +++ b/gcc/testsuite/gfortran.dg/associate_50.f90 @@ -3,6 +3,6 @@ ! Test case by Gerhard Steinmetz. program p - associate (y => p) ! { dg-error "is a PROGRAM" } - end associate + associate (y => p) ! { dg-error "Invalid association target" } + end associate ! { dg-error "Expecting END PROGRAM statement" } end program p diff --git a/gcc/testsuite/gfortran.dg/associate_51.f90 b/gcc/testsuite/gfortran.dg/associate_51.f90 new file mode 100644 index 00000000000..7b3edc44990 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/associate_51.f90 @@ -0,0 +1,54 @@ +! { dg-do compile } +! +! PR fortran/92994 +! +! Contributed by G. Steinmetz +! +recursive function f() result(z) + associate (y1 => f()) + end associate + associate (y2 => f) ! { dg-error "is a procedure name" } + end associate +end + +recursive function f2() + associate (y1 => f2()) ! { dg-error "Invalid association target" } + end associate ! { dg-error "Expecting END FUNCTION statement" } + associate (y2 => f2) ! { dg-error "is a procedure name" } + end associate +end + +subroutine p2 + type t + end type + type(t) :: z = t() + associate (y => t) + end associate +end + +subroutine p3 + procedure() :: g + associate (y => g) ! { dg-error "is a procedure name" } + end associate +end + +subroutine p4 + external :: g + associate (y => g) ! { dg-error "is a procedure name" } + end associate +end + +recursive subroutine s + associate (y => s) ! { dg-error "is a procedure name" } + end associate +end + +recursive subroutine s2 + associate (y => (s2)) ! { dg-error "Associating selector-expression at .1. yields a procedure" } + end associate +end + +program p + associate (y => (p)) ! { dg-error "Invalid association target" } + end associate ! { dg-error "Expecting END PROGRAM statement" } +end