From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 872A83945C25; Thu, 17 Sep 2020 17:00:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 872A83945C25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600362002; bh=1ekpY6eP+yp2J5QqLSXUV+dPSaSdSkjg+ehjbzQZGTA=; h=From:To:Subject:Date:From; b=iAOVNkKGuw2muyclQHDprCNZGvpHPsANWQjK/CN+R2OuhuRjYUTt5qBE9HsXjibwb 3v5vhB+CsCQ29qv9LgkY6HCzfucDEfSURjC/dzxyriUZzyobfc2ytxKj3W57hHKen7 +iuN/bTe+bZJfLKmfJK4JwQ+WiUO92wXoaMSiq14= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] Revert patch for PR fortran/93956. X-Act-Checkin: gcc X-Git-Author: Thomas Koenig X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: 40167bf79026f0d1341c87beb1f70e1c536da862 X-Git-Newrev: df20f25e21fd262e8df08860db077f05d0e1e280 Message-Id: <20200917170002.872A83945C25@sourceware.org> Date: Thu, 17 Sep 2020 17:00:02 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 17:00:02 -0000 https://gcc.gnu.org/g:df20f25e21fd262e8df08860db077f05d0e1e280 commit df20f25e21fd262e8df08860db077f05d0e1e280 Author: Thomas Koenig Date: Fri May 1 14:45:56 2020 +0200 Revert patch for PR fortran/93956. 2020-04-27 Thomas Koenig PR fortran/93956 PR fortran/94788 * expr.c (gfc_check_pointer_assign): Revert patch for PR 93956. * interface.c: Likewise. Diff: --- gcc/fortran/ChangeLog | 7 ++++ gcc/fortran/expr.c | 7 ++-- gcc/fortran/interface.c | 34 ------------------ gcc/testsuite/ChangeLog | 6 ++++ gcc/testsuite/gfortran.dg/pointer_assign_13.f90 | 47 ------------------------- 5 files changed, 15 insertions(+), 86 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4b4c1d8e886..b81ffd555ad 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2020-04-27 Thomas Koenig + + PR fortran/93956 + PR fortran/94788 + * expr.c (gfc_check_pointer_assign): Revert patch for PR 93956. + * interface.c: Likewise. + 2020-04-24 Thomas Koenig Backport from trunk. diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 5348f1bf4ce..f145e9b363b 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3895,11 +3895,8 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue, bool is_init_expr) if (rvalue->expr_type == EXPR_NULL) return true; - /* A function may also return subref arrray pointer. */ - - if ((rvalue->expr_type == EXPR_VARIABLE && is_subref_array (rvalue)) - || rvalue->expr_type == EXPR_FUNCTION) - lvalue->symtree->n.sym->attr.subref_array_pointer = 1; + if (rvalue->expr_type == EXPR_VARIABLE && is_subref_array (rvalue)) + lvalue->symtree->n.sym->attr.subref_array_pointer = 1; attr = gfc_expr_attr (rvalue); diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 26837d7c1fa..04850b0406c 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -3619,36 +3619,6 @@ check_intents (gfc_formal_arglist *f, gfc_actual_arglist *a) return true; } -/* Go through the argument list of a procedure and look for - pointers which may be set, possibly introducing a span. */ - -static void -gfc_set_subref_array_pointer_arg (gfc_formal_arglist *dummy_args, - gfc_actual_arglist *actual_args) -{ - gfc_formal_arglist *f; - gfc_actual_arglist *a; - gfc_symbol *a_sym; - for (f = dummy_args, a = actual_args; f && a ; f = f->next, a = a->next) - { - - if (f->sym == NULL) - continue; - - if (!f->sym->attr.pointer || f->sym->attr.intent == INTENT_IN) - continue; - - if (a->expr == NULL || a->expr->expr_type != EXPR_VARIABLE) - continue; - a_sym = a->expr->symtree->n.sym; - - if (!a_sym->attr.pointer) - continue; - - a_sym->attr.subref_array_pointer = 1; - } - return; -} /* Check how a procedure is used against its interface. If all goes well, the actual argument list will also end up being properly @@ -3795,10 +3765,6 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where) if (warn_aliasing) check_some_aliasing (dummy_args, *ap); - /* Set the subref_array_pointer_arg if needed. */ - if (dummy_args) - gfc_set_subref_array_pointer_arg (dummy_args, *ap); - return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ab81335d25d..b454fe17b8c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-05-01 Thomas Koenig + + PR fortran/93956 + PR fortran/94788 + * gfortran.dg/pointer_assign_13.f90: Remove. + 2020-04-24 Thomas Koenig Backport from trunk diff --git a/gcc/testsuite/gfortran.dg/pointer_assign_13.f90 b/gcc/testsuite/gfortran.dg/pointer_assign_13.f90 deleted file mode 100644 index b3f2cd9dab7..00000000000 --- a/gcc/testsuite/gfortran.dg/pointer_assign_13.f90 +++ /dev/null @@ -1,47 +0,0 @@ -! { dg-do run } -! PR 93956 - span was set incorrectly, leading to wrong code. -! Original test case by "martin". -program array_temps - implicit none - - type :: tt - integer :: u = 1 - integer :: v = 2 - end type tt - - type(tt), dimension(:), pointer :: r - integer :: n - integer, dimension(:), pointer :: p, q, u - - n = 10 - allocate(r(1:n)) - call foo(r%v,n) - p => get(r(:)) - call foo(p, n) - call get2(r,u) - call foo(u,n) - q => r%v - call foo(q, n) - -deallocate(r) - -contains - - subroutine foo(a, n) - integer, dimension(:), intent(in) :: a - integer, intent(in) :: n - if (sum(a(1:n)) /= 2*n) stop 1 - end subroutine foo - - function get(x) result(q) - type(tt), dimension(:), target, intent(in) :: x - integer, dimension(:), pointer :: q - q => x(:)%v - end function get - - subroutine get2(x,q) - type(tt), dimension(:), target, intent(in) :: x - integer, dimension(:), pointer, intent(out) :: q - q => x(:)%v - end subroutine get2 -end program array_temps