From 96ffc6cd498158fee30ebe47ca1476e8b6bff6f2 Mon Sep 17 00:00:00 2001
From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Mon, 5 Jan 2009 10:43:39 +0000
Subject: [PATCH] re PR fortran/38672 (ICE during build with versions 4.3.2 and
4.4-20081226)
2009-01-05 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/38672
* trans-types.c (gfc_get_derived_type): Check for the
presence of derived->ns->proc_name before
accessing derived->ns->proc_name->attr.flavor .
* resolve.c (resolve_symbol): Likewise.
2009-01-05 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/38672
* gfortran.dg/host_assoc_blockdata_1.f90: New test.
* gfortran.dg/host_assoc_blockdata_2.f90: New test.
From-SVN: r143074
---
gcc/fortran/ChangeLog | 8 ++++++++
gcc/fortran/resolve.c | 1 +
gcc/fortran/trans-types.c | 3 ++-
gcc/testsuite/ChangeLog | 6 ++++++
.../gfortran.dg/host_assoc_blockdata_1.f90 | 11 +++++++++++
.../gfortran.dg/host_assoc_blockdata_2.f90 | 17 +++++++++++++++++
6 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90
create mode 100644 gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b8fdb3b101f4..a6622a05e6a3 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-05 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR fortran/38672
+ * trans-types.c (gfc_get_derived_type): Check for the
+ presence of derived->ns->proc_name before
+ accessing derived->ns->proc_name->attr.flavor .
+ * resolve.c (resolve_symbol): Likewise.
+
2009-01-05 Paul Thomas <pault@gcc.gnu.org>
PR fortran/38665
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 74f8fb05114f..0cdf40eda9f2 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9247,6 +9247,7 @@ resolve_symbol (gfc_symbol *sym)
module function and is not PRIVATE. */
if (sym->ts.type == BT_DERIVED
&& sym->ts.derived->attr.use_assoc
+ && sym->ns->proc_name
&& sym->ns->proc_name->attr.flavor == FL_MODULE)
{
gfc_symbol *ds;
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index e1ff5aadde59..da0c869ca935 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -1930,7 +1930,8 @@ gfc_get_derived_type (gfc_symbol * derived)
gfc_finish_type (typenode);
gfc_set_decl_location (TYPE_STUB_DECL (typenode), &derived->declared_at);
- if (derived->module && derived->ns->proc_name->attr.flavor == FL_MODULE)
+ if (derived->module && derived->ns->proc_name
+ && derived->ns->proc_name->attr.flavor == FL_MODULE)
{
if (derived->ns->proc_name->backend_decl
&& TREE_CODE (derived->ns->proc_name->backend_decl)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5beedeb40340..d70fac70a551 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-05 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR fortran/38672
+ * gfortran.dg/host_assoc_blockdata_1.f90: New test.
+ * gfortran.dg/host_assoc_blockdata_2.f90: New test.
+
2009-01-05 Uros Bizjak <ubizjak@gmail.com>
* gcc.dg/compat/struct-layout-1_generate.c (dg-options): Add -mieee
diff --git a/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 b/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90
new file mode 100644
index 000000000000..7f24fecb0e00
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! PR 38672 - this used to ICE.
+MODULE globals
+ TYPE :: type1
+ integer :: x
+ END TYPE type1
+ TYPE (type1) :: pdm_bps
+END module globals
+BLOCK DATA
+ use globals
+END BLOCK DATA
diff --git a/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 b/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90
new file mode 100644
index 000000000000..3cb4abaedd23
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+MODULE globals
+ TYPE :: type1
+ sequence
+ integer :: x
+ END TYPE type1
+ TYPE (type1) :: pdm_bps
+ common /co/ pdm_bps
+END module globals
+BLOCK DATA
+ use globals
+END BLOCK DATA
+
+program main
+ use globals
+ common /co/ pdm_bps ! { dg-error "already in a COMMON block" }
+end program main
--
GitLab