From 6230987eebe7fc0e2f631c41fc92a40795acad77 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <burnus@net-b.de>
Date: Sat, 3 Mar 2012 19:55:57 +0100
Subject: [PATCH] re PR fortran/48820 (TR 29113: Implement parts needed for MPI
3)
2012-03-03 Tobias Burnus <burnus@net-b.de>
PR fortran/48820
* resolve.c (resolve_actual_arglist): Properly reset
assumed_type_expr_allowed.
2012-03-03 Tobias Burnus <burnus@net-b.de>
PR fortran/48820
* gfortran.dg/assumed_type_3.f90: Undo previous commit.
From-SVN: r184863
---
gcc/fortran/ChangeLog | 6 ++++++
gcc/fortran/resolve.c | 2 +-
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gfortran.dg/assumed_type_3.f90 | 10 ++++------
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f488afc37bb7..0234bede6f2d 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-03 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/48820
+ * resolve.c (resolve_actual_arglist): Properly reset
+ assumed_type_expr_allowed.
+
2012-03-03 Tobias Burnus <burnus@net-b.de>
* lang.opt (Wc-binding-type): New flag.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 618c6f56c8c0..b63a0c69e6a6 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1833,7 +1833,7 @@ resolve_actual_arglist (gfc_actual_arglist *arg, procedure_type ptype,
return FAILURE;
}
}
- assumed_type_expr_allowed = true;
+ assumed_type_expr_allowed = false;
return SUCCESS;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4275d9d8674..090be6120aac 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-03 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/48820
+ * gfortran.dg/assumed_type_3.f90: Undo previous commit.
+
2012-03-03 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/bind_c_dts_4.f03: Add dg-options -Wc-binding-type.
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_3.f90 b/gcc/testsuite/gfortran.dg/assumed_type_3.f90
index 15619ce1b95d..d88da34cf822 100644
--- a/gcc/testsuite/gfortran.dg/assumed_type_3.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_type_3.f90
@@ -5,11 +5,6 @@
!
! Test TYPE(*)
-subroutine fourteen(x)
- type(*) :: x
- x = x ! { dg-error "Invalid expression with assumed-type variable" }
-end subroutine fourteen
-
subroutine one(a) ! { dg-error "may not have the ALLOCATABLE, CODIMENSION, POINTER or VALUE attribute" }
type(*), value :: a
end subroutine one
@@ -118,4 +113,7 @@ subroutine thirteen(x, y)
print *, ubound(y, dim=x) ! { dg-error "must be INTEGER" }
end subroutine thirteen
-
+subroutine fourteen(x)
+ type(*) :: x
+ x = x ! { dg-error "Invalid expression with assumed-type variable" }
+end subroutine fourteen
--
GitLab