aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/decl.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/entry_21.f9017
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9da1694..8f571b4 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
+ PR fortran/66044
+ * decl.c(gfc_match_entry): Change a gfc_internal_error() into
+ a gfc_error()
+
+2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
+
PR fortran/66043
* gfortran.dg/storage_size_6.f90: New tests.
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 13002d4..f8d471a 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -5592,7 +5592,7 @@ gfc_match_entry (void)
"a contained subprogram");
break;
default:
- gfc_internal_error ("gfc_match_entry(): Bad state");
+ gfc_error ("Unexpected ENTRY statement at %C");
}
return MATCH_ERROR;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bda83a5..9f5c0ba 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
+ PR fortran/66044
+ * gfortran.dg/entry_21.f90: New test.
+
+2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
+
PR fortran/66043
* gfortran.dg/storage_size_6.f90: New tests.
diff --git a/gcc/testsuite/gfortran.dg/entry_21.f90 b/gcc/testsuite/gfortran.dg/entry_21.f90
new file mode 100644
index 0000000..999f2bd
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/entry_21.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! PR fortran/66044
+!
+! Original code from Gerhard Steinmetz
+! <gerhard dot steinmetz dot fortran at t-online dot de>
+subroutine p
+end subroutine p
+
+entry e ! { dg-error "Unexpected ENTRY statement" }
+end
+
+module m
+ type t
+ contains
+ entry e ! { dg-error "Unexpected ENTRY statement" }
+ end type
+end module m