Commit 388902da by Louis Krupp Committed by Louis Krupp

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
parent 96f3dd0a
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> 2015-10-26 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/36192 PR fortran/36192
......
...@@ -1291,6 +1291,8 @@ typedef struct gfc_st_label ...@@ -1291,6 +1291,8 @@ typedef struct gfc_st_label
tree backend_decl; tree backend_decl;
locus where; locus where;
gfc_namespace *ns;
} }
gfc_st_label; gfc_st_label;
......
...@@ -28,7 +28,7 @@ along with GCC; see the file COPYING3. If not see ...@@ -28,7 +28,7 @@ along with GCC; see the file COPYING3. If not see
gfc_st_label gfc_st_label
format_asterisk = {0, NULL, NULL, -1, ST_LABEL_FORMAT, ST_LABEL_FORMAT, NULL, format_asterisk = {0, NULL, NULL, -1, ST_LABEL_FORMAT, ST_LABEL_FORMAT, NULL,
0, {NULL, NULL}}; 0, {NULL, NULL}, NULL};
typedef struct typedef struct
{ {
......
...@@ -2195,7 +2195,7 @@ gfc_free_st_label (gfc_st_label *label) ...@@ -2195,7 +2195,7 @@ gfc_free_st_label (gfc_st_label *label)
if (label == NULL) if (label == NULL)
return; 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) if (label->format != NULL)
gfc_free_expr (label->format); gfc_free_expr (label->format);
...@@ -2260,6 +2260,7 @@ gfc_get_st_label (int labelno) ...@@ -2260,6 +2260,7 @@ gfc_get_st_label (int labelno)
lp->value = labelno; lp->value = labelno;
lp->defined = ST_LABEL_UNKNOWN; lp->defined = ST_LABEL_UNKNOWN;
lp->referenced = ST_LABEL_UNKNOWN; lp->referenced = ST_LABEL_UNKNOWN;
lp->ns = ns;
gfc_insert_bbt (&ns->st_labels, lp, compare_st_labels); gfc_insert_bbt (&ns->st_labels, lp, compare_st_labels);
......
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> 2015-10-26 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/36192 PR fortran/36192
......
! { 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" }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment