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

re PR fortran/67614 (ICE on using arithmetic if with null) 

2015-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/67614
	* resolve.c (gfc_resolve_code): Prevent ICE for invalid EXPR_NULL.

2015-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/67614
	* gfortran.dg/pr67614.f90: New test.

From-SVN: r228156
This commit is contained in:
Steven G. Kargl 2015-09-25 22:30:26 +00:00
parent b15e7bddd6
commit 2d2de608f8
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67614
* resolve.c (gfc_resolve_code): Prevent ICE for invalid EXPR_NULL.
2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67525

6
gcc/fortran/resolve.c
View File

@ -10380,10 +10380,14 @@ gfc_resolve_code (gfc_code *code, gfc_namespace *ns)
{
gfc_expr *e = code->expr1;
gfc_resolve_expr (e);
if (e->expr_type == EXPR_NULL)
gfc_error ("Invalid NULL at %L", &e->where);
if (t && (e->rank > 0
|| !(e->ts.type == BT_REAL || e->ts.type == BT_INTEGER)))
gfc_error ("Arithmetic IF statement at %L requires a scalar "
"REAL or INTEGER expression", &code->expr1->where);
"REAL or INTEGER expression", &e->where);
resolve_branch (code->label1, code);
resolve_branch (code->label2, code);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67614
* gfortran.dg/pr67614.f90: New test.
2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67525

12
gcc/testsuite/gfortran.dg/pr67614.f90 Normal file
View File

@ -0,0 +1,12 @@
! { dg-do compile }
! { dg-options "-std=legacy" }
! PR fortran/67614
!
program foo
implicit none
integer, pointer :: z
if (null(z)) 10, 20, 30 ! { dg-error "Invalid NULL" }
10 continue
20 continue
30 continue
end program foo