From 4ee3237e0b5796d047d0b9f01fbe0277ff14d083 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Thu, 18 Aug 2011 23:39:42 +0200 Subject: re PR fortran/50071 (gfortran does not distinguish labels in different type scoping units) 2011-08-18 Mikael Morin PR fortran/50071 * symbol.c (gfc_get_st_label): Use the derived type namespace when we are parsing a derived type definition. 2011-08-18 Mikael Morin PR fortran/50071 * gfortran.dg/duplicate_labels_2.f: New test. From-SVN: r177882 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/symbol.c | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fa92219..85538ee 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-08-18 Mikael Morin + + PR fortran/50071 + * symbol.c (gfc_get_st_label): Use the derived type namespace when + we are parsing a derived type definition. + 2011-08-18 Tobias Burnus PR fortran/18918 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index b761cdd..4463460 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -2127,11 +2127,16 @@ gfc_get_st_label (int labelno) gfc_st_label *lp; gfc_namespace *ns; - /* Find the namespace of the scoping unit: - If we're in a BLOCK construct, jump to the parent namespace. */ - ns = gfc_current_ns; - while (ns->proc_name && ns->proc_name->attr.flavor == FL_LABEL) - ns = ns->parent; + if (gfc_current_state () == COMP_DERIVED) + ns = gfc_current_block ()->f2k_derived; + else + { + /* Find the namespace of the scoping unit: + If we're in a BLOCK construct, jump to the parent namespace. */ + ns = gfc_current_ns; + while (ns->proc_name && ns->proc_name->attr.flavor == FL_LABEL) + ns = ns->parent; + } /* First see if the label is already in this namespace. */ lp = ns->st_labels; -- cgit v1.1