re PR fortran/34662 (inout argument with parameter)

2008-01-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/34662
        * interface.c (compare_actual_formal): Reject parameter
        actual to intent(out) dummy.

2008-01-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/34662
        * gfortran.dg/intent_out_3.f90: New.

From-SVN: r131348

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 82f4cd7aea436134faa00d75f6ca7d0c20f178b5..43d7519d13af00582a6a84ef4e04095cd36a2eda 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-06  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/34662
+       * interface.c (compare_actual_formal): Reject parameter
+       actual to intent(out) dummy.
+
 2008-01-04  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/34557

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 519251efb2e4f3923b3ff32290e9612280085a6e..b900b102fe5e552d8c74ab28214e8993f12a34ff 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -1908,13 +1908,15 @@ compare_actual_formal (gfc_actual_arglist **ap, gfc_formal_arglist *formal,
        }
 
       /* Check intent = OUT/INOUT for definable actual argument.  */
-      if (a->expr->expr_type != EXPR_VARIABLE
+      if ((a->expr->expr_type != EXPR_VARIABLE
+          || a->expr->symtree->n.sym->attr.flavor != FL_VARIABLE)
          && (f->sym->attr.intent == INTENT_OUT
              || f->sym->attr.intent == INTENT_INOUT))
        {
          if (where)
-           gfc_error ("Actual argument at %L must be definable to "
-                      "match dummy INTENT = OUT/INOUT", &a->expr->where);
+           gfc_error ("Actual argument at %L must be definable as "
+                      "the dummy argument '%s' is INTENT = OUT/INOUT",
+                      &a->expr->where, f->sym->name);
          return 0;
        }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8519caecd7f3a5a0606b4264f2cd6fda0bbe403b..5cecf0642e653bc577535a29626293d756bc47c0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-06  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/34662
+       * gfortran.dg/intent_out_3.f90: New.
+
 2008-01-05  Richard Sandiford  <rsandifo@nildram.co.uk>
 
        * objc.dg/stabs-1.m: Allow labels to be begin with $L as well as .L.

diff --git a/gcc/testsuite/gfortran.dg/intent_out_3.f90 b/gcc/testsuite/gfortran.dg/intent_out_3.f90
new file mode 100644 (file)
index 0000000..7b68a35
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/intent_out_3.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+!
+! PR fortran/34662
+! The INTENT error was not detected.
+! Test case contributed by Joost VandeVondele.
+!
+MODULE M1
+ TYPE T1
+  INTEGER :: I(3)
+ END TYPE T1
+ TYPE(T1), PARAMETER :: D1=T1((/1,2,3/))
+CONTAINS
+ SUBROUTINE S1(J)
+  INTEGER, INTENT(INOUT) :: J
+ END SUBROUTINE S1
+END MODULE M1
+USE M1
+CALL S1(D1%I(3)) ! { dg-error "must be definable" }
+END