re PR fortran/62270 (-Wlogical-not-parentheses warnings)

	PR fortran/62270
	* interface.c (compare_parameter): Fix condition.
	* trans-expr.c (gfc_conv_procedure_call): Likewise.

	* gfortran.dg/pointer_intent_7.f90: Adjust dg-error.

From-SVN: r214827

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index eab86ed371b05aa90718d85c43b8314a3483c24c..518923baa5f6acb36dfc15cfc8fc30aa449dd77e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-02  Marek Polacek  <polacek@redhat.com>
+
+       PR fortran/62270
+       * interface.c (compare_parameter): Fix condition.
+       * trans-expr.c (gfc_conv_procedure_call): Likewise.
+
 2014-08-31  Fritz Reese  <Reese-Fritz@zai.com>
 
        PR fortran/62309

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index b210d18256d59b69cb5e45c7d5b9cac3c167c28f..f6233b77b3785016eabd4e2de4c07d60e57d8268 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -2014,7 +2014,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
   if (formal->ts.type == BT_CLASS && formal->attr.class_ok
       && 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/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index f2ed47467cd365cd2c2bf6022366e7ac035bc84a..4c057eea10d61bf4de986b2d4c33e3a9afe85acd 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -4589,7 +4589,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
                      && e->expr_type == EXPR_VARIABLE
                      && (!e->ref
                          || (e->ref->type == REF_ARRAY
-                             && !e->ref->u.ar.type != AR_FULL))
+                             && e->ref->u.ar.type != AR_FULL))
                      && e->symtree->n.sym->attr.optional)
                    {
                      tmp = fold_build3_loc (input_location, COND_EXPR,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 97e73f83672cc46b971667c0c3530cf88b27e7d1..fa8fb470d66e19681b08a5c718448f710725cdde 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-02  Marek Polacek  <polacek@redhat.com>
+
+       PR fortran/62270
+       * gfortran.dg/pointer_intent_7.f90: Adjust dg-error.
+
 2014-09-02  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        PR target/62275

diff --git a/gcc/testsuite/gfortran.dg/pointer_intent_7.f90 b/gcc/testsuite/gfortran.dg/pointer_intent_7.f90
index c09eb2b5ffa057c67354a099101c08c8c5fc7333..5387ace8c1977e8da7b50abfe5bc6b8edaa4b4ca 100644 (file)
--- 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