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

re PR fortran/86059 (ICE in reduce_binary_ac, at fortran/arith.c:1308 (and others))

Browse Source 
2018-06-08  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/86059 
	* array.c (match_array_cons_element): NULL() cannot be in an
	array constructor.

2018-06-08  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/86059 
	* gfortran.dg/associate_30.f90: Remove code tested ...
	* gfortran.dg/pr67803.f90: Ditto.
	* gfortran.dg/pr67805.f90: Ditto.
	* gfortran.dg/pr86059.f90: ... here.  New test.

From-SVN: r261344
This commit is contained in:
Steven G. Kargl 2018-06-08 19:11:21 +00:00
parent 5954faa7c2
commit 2f2fc3252c
7 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2018-06-08 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/86059
* array.c (match_array_cons_element): NULL() cannot be in an
array constructor.
2018-06-08 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78571

9
gcc/fortran/array.c
View File

@ -1098,6 +1098,15 @@ match_array_cons_element (gfc_constructor_base *result)
if (m != MATCH_YES)
return m;
if (expr->expr_type == EXPR_FUNCTION
&& expr->ts.type == BT_UNKNOWN
&& strcmp(expr->symtree->name, "null") == 0)
{
gfc_error ("NULL() at %C cannot appear in an array constructor");
gfc_free_expr (expr);
return MATCH_ERROR;
}
gfc_constructor_append_expr (result, expr, &gfc_current_locus);
return MATCH_YES;
}

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2018-06-08 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/86059
* gfortran.dg/associate_30.f90: Remove code tested ...
* gfortran.dg/pr67803.f90: Ditto.
* gfortran.dg/pr67805.f90: Ditto.
* gfortran.dg/pr86059.f90: ... here. New test.
2018-06-08 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78571

5
gcc/testsuite/gfortran.dg/associate_30.f90
View File

@ -8,8 +8,3 @@
associate (x => null()) ! { dg-error "cannot be NULL()" }
end associate
end subroutine
subroutine s2
associate (x => [null()]) ! { dg-error "has no type" }
end associate
end subroutine

1
gcc/testsuite/gfortran.dg/pr67803.f90
View File

@ -10,5 +10,4 @@ program p
x = '0' // [character :: 1d1] ! { dg-error "Incompatible typespec for" }
x = '0' // [character :: (0.,1.)] ! { dg-error "Incompatible typespec for" }
x = '0' // [character :: .true.] ! { dg-error "Incompatible typespec for" }
x = '0' // [character :: null()] ! { dg-error "Incompatible typespec for" }
end

1
gcc/testsuite/gfortran.dg/pr67805.f90
View File

@ -22,7 +22,6 @@ subroutine p
s = [character([1.]) :: 'x', 'y'] ! { dg-error "INTEGER expression expected" }
s = [character([1d1]) :: 'x', 'y'] ! { dg-error "INTEGER expression expected" }
s = [character([(0.,1.)]) :: 'x', 'y'] ! { dg-error "INTEGER expression expected" }
s = [character([null()]) :: 'x', 'y'] ! { dg-error "INTEGER expression expected" }
s = [character(null()) :: 'x', 'y'] ! { dg-error "INTEGER expression expected" }
call foo(s)
end subroutine p

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

@ -0,0 +1,8 @@
! { dg-do compile }
! PR fortran/86059
program foo
integer :: i(2) = [ null(), 1 ] ! { dg-error "cannot appear in an array constructor" }
integer :: j(2) = [ (null(), n = 1, 2) ] ! { dg-error "cannot appear in an array constructor" }
integer k(2)
k = 42 + [1, null()] ! { dg-error "cannot appear in an array constructor" }
end program foo