aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/parse.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/empty_function_1.f9030
4 files changed, 42 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d000a1a..732b0f7 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-01 Mikael Morin <mikael.morin@tele2.fr>
+
+ PR fortran/38252
+ * parse.c (parse_spec): Skip statement order check in case
+ of a CONTAINS statement.
+
2008-11-30 Daniel Kraft <d@domob.eu>
PR fortran/37779
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 7eb0027..3e86a43 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -2338,7 +2338,7 @@ loop:
{
bool verify_now = false;
- if (st == ST_END_FUNCTION)
+ if (st == ST_END_FUNCTION || st == ST_CONTAINS)
verify_now = true;
else
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9613813..b326f18 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-01 Mikael Morin <mikael.morin@tele2.fr>
+
+ PR fortran/38252
+ * gfortran.dg/empty_function_1.f90: New test.
+
2008-12-01 Uros Bizjak <ubizjak@gmail.com>
PR rtl-optimization/33642
diff --git a/gcc/testsuite/gfortran.dg/empty_function_1.f90 b/gcc/testsuite/gfortran.dg/empty_function_1.f90
new file mode 100644
index 0000000..a9cc185
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/empty_function_1.f90
@@ -0,0 +1,30 @@
+! { dg-do compile }
+!
+! PR fortran/38252
+! FUNCTION rejected if both specification and execution part are empty
+!
+! Contributed by Daniel Kraft <d@domob.eu>
+
+INTEGER FUNCTION test ()
+CONTAINS
+END FUNCTION test
+! { dg-do compile }
+!
+! PR fortran/38252
+! FUNCTION rejected if both specification and execution part are empty
+!
+! Contributed by Daniel Kraft <d@domob.eu>
+
+INTEGER FUNCTION test ()
+CONTAINS
+END FUNCTION test
+! { dg-do compile }
+!
+! PR fortran/38252
+! FUNCTION rejected if both specification and execution part are empty
+!
+! Contributed by Daniel Kraft <d@domob.eu>
+
+INTEGER FUNCTION test ()
+CONTAINS
+END FUNCTION test