OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/66056 (ICEs and endless compilation for lonely labels/numbers in type) 

2015-10-26  Louis Krupp  <louis.krupp@zoho.com>

	PR fortran/66056
	* fortran.h: Include namespace pointer in statement label
	structure.
	* symbol.c (gfc_get_st_label): Store pointer to namespace
	that owns the statement label tree in each label.
	(gfc_free_st_label): Use namespace owning statement label
	tree when deleting statement label.
	* io.c: Initialize format_asterisk with NULL namespace pointer.

2015-10-26  Louis Krupp  <louis.krupp@zoho.com>

	PR fortran/66056
	* gfortran.dg/empty_label_typedecl.f90: New test

From-SVN: r229390
This commit is contained in:
Louis Krupp 2015-10-26 19:18:08 +00:00 committed by Louis Krupp
parent 96f3dd0a66
commit 388902dab9
6 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/fortran/ChangeLog
View File

@ -1,3 +1,14 @@
2015-10-26 Louis Krupp <louis.krupp@zoho.com>
PR fortran/66056
* fortran.h: Include namespace pointer in statement label
structure.
* symbol.c (gfc_get_st_label): Store pointer to namespace
that owns the statement label tree in each label.
(gfc_free_st_label): Use namespace owning statement label
tree when deleting statement label.
* io.c: Initialize format_asterisk with NULL namespace pointer.
2015-10-26 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/36192

2
gcc/fortran/gfortran.h
View File

@ -1291,6 +1291,8 @@ typedef struct gfc_st_label
tree backend_decl;
locus where;
gfc_namespace *ns;
}
gfc_st_label;

2
gcc/fortran/io.c
View File

@ -28,7 +28,7 @@ along with GCC; see the file COPYING3. If not see
gfc_st_label
format_asterisk = {0, NULL, NULL, -1, ST_LABEL_FORMAT, ST_LABEL_FORMAT, NULL,
0, {NULL, NULL}};
0, {NULL, NULL}, NULL};
typedef struct
{

3
gcc/fortran/symbol.c
View File

@ -2195,7 +2195,7 @@ gfc_free_st_label (gfc_st_label *label)
if (label == NULL)
return;
gfc_delete_bbt (&gfc_current_ns->st_labels, label, compare_st_labels);
gfc_delete_bbt (&label->ns->st_labels, label, compare_st_labels);
if (label->format != NULL)
gfc_free_expr (label->format);
@ -2260,6 +2260,7 @@ gfc_get_st_label (int labelno)
lp->value = labelno;
lp->defined = ST_LABEL_UNKNOWN;
lp->referenced = ST_LABEL_UNKNOWN;
lp->ns = ns;
gfc_insert_bbt (&ns->st_labels, lp, compare_st_labels);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-10-26 Louis Krupp <louis.krupp@zoho.com>
PR fortran/66056
* gfortran.dg/empty_label_typedecl.f90: New test.
2015-10-26 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/36192

8
gcc/testsuite/gfortran.dg/empty_label_typedecl.f90 Normal file
View File

@ -0,0 +1,8 @@
! { dg-do compile }
! { dg-options "-Werror" }
subroutine s
type t
1 ! { dg-error "empty statement" }
end type
end subroutine
! { dg-excess-errors "warnings being treated as errors" }