From patchwork Fri Feb 9 17:13:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janus Weil X-Patchwork-Id: 871495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-472968-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.b="OY6rkBcx"; 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 3zdM9772nnz9s1h for ; Sat, 10 Feb 2018 04:13:47 +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 :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=xKfb2fpIXdK1lxjRqkDu94+9U7GJjUq71+O+7sipANc7p7 psiHoSvDt8weyiEV6ZmZYxFRfLTnwmd/3/sY0+CjvalHYB1cDx4tvIVb+2+BOYZW nn/mDPdzS3HJBpxHYD812wPkGFd1VBaZUMDBlA2Lqmun6/tp2suhyDyuPFWcg= 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 :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=PpLBDKpIjQpnIipucjn6vWyVgNg=; b=OY6rkBcxb201lS8cBpw3 JyvGu+/sXr7ixIz3dIRIrNic+9fIqFG012me+JnauWUfq5RSHqzJaCoJZKCc1sk8 NNCHe/egY/+/+XUpnHSPBxAJq+JcnyH1gLQdKQwYjlleJgnlAq6oCpKHoKWB5ImV EuhvSItPIH1GuiKP9DYcXJI= Received: (qmail 119059 invoked by alias); 9 Feb 2018 17:13:40 -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 119035 invoked by uid 89); 9 Feb 2018 17:13:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.0 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:janus@g, janus@gcc.gnu.org, U*janus, sk:janusg X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-yw0-f179.google.com Received: from mail-yw0-f179.google.com (HELO mail-yw0-f179.google.com) (209.85.161.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 09 Feb 2018 17:13:37 +0000 Received: by mail-yw0-f179.google.com with SMTP id j128so5574834ywg.7; Fri, 09 Feb 2018 09:13:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=59MXQvUe8L1gmRDoSpYrxxZz+ILBkJ2JdFpMwjDrSik=; b=P4hKxnRniPyzBvY/t5iR/8UX3mc9LHdbfuRVgy4zZga/wSN5XTLmemMCMRXTmf2jI0 wEug/QW64UGm+mKM0B75TH6goKQtOs9U/69qg2D2ko8B8awTHf+XV73TSrl2IIJAObEl ZMfMHUMYuGCqQLjPIqvb4bYVrGz+U7EQswVvQqtamSLizy/1Y46RO7tK38Ko1BlsI8j5 nrHXhGLJvlY/oQdncoyTHQhL7ihl2xzELnMR/cUBdw82n/pYsga5XQRfdiTsJA9ec7k4 MuoR++BjLC7VG2ld/NcxFLLTwuzWZubErIvABltIks2iZpyFCFdppmYzvDrEgR1PUsHf iYGA== X-Gm-Message-State: APf1xPBqH+6KjSfTEXigkPUo/C7h5c/xqJuv/RffcbBU8hRiNjhBRZNY +CiQOQFJewfDVP+vGcxF/puvjc2RbwLmwEJGqEtuwQ== X-Google-Smtp-Source: AH8x224CvumvFEXEAk6xzm5pVvDYsoTVniNJmZtt583ITcmrdkOauXvoJ//GflH5He8OXr75rNTs+BJiYcMDexhsVOY= X-Received: by 10.37.182.139 with SMTP id s11mr2244850ybj.399.1518196415969; Fri, 09 Feb 2018 09:13:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.129.85.138 with HTTP; Fri, 9 Feb 2018 09:13:34 -0800 (PST) From: Janus Weil Date: Fri, 9 Feb 2018 18:13:34 +0100 Message-ID: Subject: [Patch, Fortran] PR 84273: Reject allocatable passed-object dummy argument (proc_ptr_47.f90) To: gfortran , gcc-patches Hi all, the attached patch fixes some checking code for PASS arguments in procedure-pointer components, which does not properly account for the fact that the PASS argument needs to be polymorphic. [The reason for this issue is probably that PPCs were mostly implemented before polymorphism was available. The corresponding pass-arg checks for TBPs are ok.] The patch also fixes an invalid test case (which was detected thanks to Neil Carlson). It regtests cleanly on x86_64-linux-gnu. Ok for trunk? Cheers, Janus 2018-02-09 Janus Weil PR fortran/84273 * resolve.c (resolve_component): Fix checks of passed argument in procedure-pointer components. 2018-02-09 Janus Weil PR fortran/84273 * gfortran.dg/proc_ptr_47.f90: Fix invalid test case. * gfortran.dg/proc_ptr_comp_pass_4.f90: Fix and extend test case. Index: gcc/fortran/resolve.c =================================================================== --- gcc/fortran/resolve.c (revision 257498) +++ gcc/fortran/resolve.c (working copy) @@ -13703,8 +13703,8 @@ resolve_component (gfc_component *c, gfc_symbol *s return false; } - /* Check for C453. */ - if (me_arg->attr.dimension) + /* Check for F03:C453. */ + if (CLASS_DATA (me_arg)->attr.dimension) { gfc_error ("Argument %qs of %qs with PASS(%s) at %L " "must be scalar", me_arg->name, c->name, me_arg->name, @@ -13713,7 +13713,7 @@ resolve_component (gfc_component *c, gfc_symbol *s return false; } - if (me_arg->attr.pointer) + if (CLASS_DATA (me_arg)->attr.class_pointer) { gfc_error ("Argument %qs of %qs with PASS(%s) at %L " "may not have the POINTER attribute", me_arg->name, @@ -13722,7 +13722,7 @@ resolve_component (gfc_component *c, gfc_symbol *s return false; } - if (me_arg->attr.allocatable) + if (CLASS_DATA (me_arg)->attr.allocatable) { gfc_error ("Argument %qs of %qs with PASS(%s) at %L " "may not be ALLOCATABLE", me_arg->name, c->name, Index: gcc/testsuite/gfortran.dg/proc_ptr_47.f90 =================================================================== --- gcc/testsuite/gfortran.dg/proc_ptr_47.f90 (revision 257498) +++ gcc/testsuite/gfortran.dg/proc_ptr_47.f90 (working copy) @@ -21,13 +21,9 @@ contains function foo(A) - class(AA), allocatable :: A + class(AA) :: A type(AA) foo - if (.not.allocated (A)) then - allocate (A, source = AA (2, foo)) - endif - select type (A) type is (AA) foo = AA (3, foo) Index: gcc/testsuite/gfortran.dg/proc_ptr_comp_pass_4.f90 =================================================================== --- gcc/testsuite/gfortran.dg/proc_ptr_comp_pass_4.f90 (revision 257498) +++ gcc/testsuite/gfortran.dg/proc_ptr_comp_pass_4.f90 (working copy) @@ -37,22 +37,23 @@ module m type :: t8 procedure(foo8), pass, pointer :: f8 ! { dg-error "must be of the derived type" } + procedure(foo9), pass, pointer :: f9 ! { dg-error "Non-polymorphic passed-object dummy argument" } end type contains subroutine foo1 (x1,y1) - type(t1) :: x1(:) + class(t1) :: x1(:) type(t1) :: y1 end subroutine subroutine foo2 (x2,y2) - type(t2),pointer :: x2 + class(t2),pointer :: x2 type(t2) :: y2 end subroutine subroutine foo3 (x3,y3) - type(t3),allocatable :: x3 + class(t3),allocatable :: x3 type(t3) :: y3 end subroutine @@ -69,4 +70,8 @@ contains integer :: i end function + subroutine foo9(x) + type(t8) :: x + end subroutine + end module m