mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 13:41:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/66045 (ICE on incorrect code with null)

Browse Source 
2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/66045
	* expr.c (gfc_check_assign):  Check for assignment of NULL() instead
	of the (intended) pointer assignment.

2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/66045
	* gfortran.dg/null1.f90: New test.

From-SVN: r223322
This commit is contained in:
Steven G. Kargl 2015-05-18 22:21:08 +00:00
parent fce523bf9b
commit bfeeb14516
4 changed files with 26 additions and 4 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-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66043
* gfortran.dg/storage_size_6.f90: New tests.
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66044

11
gcc/fortran/expr.c
View File

@ -3128,19 +3128,22 @@ gfc_check_assign (gfc_expr *lvalue, gfc_expr *rvalue, int conform)
bad_proc = true;
/* (ii) The assignment is in the main program; or */
if (gfc_current_ns->proc_name->attr.is_main_program)
if (gfc_current_ns->proc_name
&& gfc_current_ns->proc_name->attr.is_main_program)
bad_proc = true;
/* (iii) A module or internal procedure... */
if ((gfc_current_ns->proc_name->attr.proc == PROC_INTERNAL
|| gfc_current_ns->proc_name->attr.proc == PROC_MODULE)
if (gfc_current_ns->proc_name
&& (gfc_current_ns->proc_name->attr.proc == PROC_INTERNAL
|| gfc_current_ns->proc_name->attr.proc == PROC_MODULE)
&& gfc_current_ns->parent
&& (!(gfc_current_ns->parent->proc_name->attr.function
|| gfc_current_ns->parent->proc_name->attr.subroutine)
|| gfc_current_ns->parent->proc_name->attr.is_main_program))
{
/* ... that is not a function... */
if (!gfc_current_ns->proc_name->attr.function)
if (gfc_current_ns->proc_name
&& !gfc_current_ns->proc_name->attr.function)
bad_proc = true;
/* ... or is not an entry and has a different name. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66045
* gfortran.dg/null1.f90: New test.
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66044

9
gcc/testsuite/gfortran.dg/null1.f90 Normal file
View File

@ -0,0 +1,9 @@
! { dg-do compile }
! PR fortran/66045
!
! Original code from Gerhard Steinmetz
! <gerhard dot steinmetz dot fortran at t-online dot de>
program p
contains
integer :: null=null() ! { dg-error "NULL appears on right-hand side" }
end