From: Marek Polacek Date: Wed, 3 Sep 2014 17:25:45 +0000 (+0000) Subject: re PR fortran/62270 (-Wlogical-not-parentheses warnings) X-Git-Tag: releases/gcc-4.8.4~249 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ff2253d918dc884ba709c112016d67f402869ee;p=thirdparty%2Fgcc.git re PR fortran/62270 (-Wlogical-not-parentheses warnings) PR fortran/62270 * interface.c (compare_parameter): Fix condition. * gfortran.dg/pointer_intent_7.f90: Adjust dg-error. From-SVN: r214887 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2ac8fb3797cd..c7001ca627c8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-09-03 Marek Polacek + + Backport from trunk + PR fortran/62270 + * interface.c (compare_parameter): Fix condition. + 2014-08-21 Thomas Koenig Backport from trunk diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 725cd8a4b766..e38bb1f5d0bb 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1923,7 +1923,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, /* F2008, 12.5.2.5; IR F08/0073. */ if (formal->ts.type == BT_CLASS && actual->expr_type != EXPR_NULL && ((CLASS_DATA (formal)->attr.class_pointer - && !formal->attr.intent == INTENT_IN) + && formal->attr.intent != INTENT_IN) || CLASS_DATA (formal)->attr.allocatable)) { if (actual->ts.type != BT_CLASS) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cdc118d83d22..d8f884af4303 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2014-09-03 Marek Polacek + + Backport from mainline + 2014-09-02 Marek Polacek + + PR fortran/62270 + * gfortran.dg/pointer_intent_7.f90: Adjust dg-error. + 2014-09-03 Martin Jambor PR ipa/62015 diff --git a/gcc/testsuite/gfortran.dg/pointer_intent_7.f90 b/gcc/testsuite/gfortran.dg/pointer_intent_7.f90 index c09eb2b5ffa0..5387ace8c197 100644 --- a/gcc/testsuite/gfortran.dg/pointer_intent_7.f90 +++ b/gcc/testsuite/gfortran.dg/pointer_intent_7.f90 @@ -23,7 +23,7 @@ contains call bar2 (c) call bar3 (c) call bar2p (b) ! { dg-error "INTENT\\(IN\\) in pointer association context \\(actual argument to INTENT = OUT/INOUT" } - call bar3p (b) ! { dg-error "INTENT\\(IN\\) in pointer association context \\(actual argument to INTENT = OUT/INOUT" } + call bar3p (b) ! { dg-error "Actual argument to .n. at \\(1\\) must be polymorphic" } call bar2p (c) ! { dg-error "INTENT\\(IN\\) in pointer association context \\(actual argument to INTENT = OUT/INOUT" } call bar3p (c) ! { dg-error "INTENT\\(IN\\) in pointer association context \\(actual argument to INTENT = OUT/INOUT" } end subroutine