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

re PR fortran/88357 (ICE in parse_associate, at fortran/parse.c:4568)

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

	PR fortran/88357
	* class.c (insert_component_ref): Check for NULL pointer and 
	previous error message issued.
	* parse.c (parse_associate): Check for NULL pointer.
	* resolve.c (resolve_assoc_var): Check for NULL pointer.

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

	* gfortran.dg/pr88357_1.f90: New test.
	* gfortran.dg/pr88357_2.f90: New test.

From-SVN: r266908
This commit is contained in:
Steven G. Kargl 2018-12-08 18:09:05 +00:00
parent 47e1596cc1
commit 4874b4d26c
7 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/fortran/ChangeLog
View File

@ -1,3 +1,11 @@
2018-12-08 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/88357
* class.c (insert_component_ref): Check for NULL pointer and
previous error message issued.
* parse.c (parse_associate): Check for NULL pointer.
* resolve.c (resolve_assoc_var): Check for NULL pointer.
2018-12-07 Jakub Jelinek <jakub@redhat.com>
PR fortran/88377

10
gcc/fortran/class.c
View File

@ -72,14 +72,18 @@ along with GCC; see the file COPYING3. If not see
static void
insert_component_ref (gfc_typespec *ts, gfc_ref **ref, const char * const name)
{
gfc_symbol *type_sym;
gfc_ref *new_ref;
int wcnt, ecnt;
gcc_assert (ts->type == BT_DERIVED || ts->type == BT_CLASS);
type_sym = ts->u.derived;
gfc_find_component (type_sym, name, true, true, &new_ref);
gfc_find_component (ts->u.derived, name, true, true, &new_ref);
gfc_get_errors (&wcnt, &ecnt);
if (ecnt > 0 && !new_ref)
return;
gcc_assert (new_ref->u.c.component);
while (new_ref->next)
new_ref = new_ref->next;
new_ref->next = *ref;

2
gcc/fortran/parse.c
View File

@ -4563,7 +4563,7 @@ parse_associate (void)
else
rank = a->target->rank;
/* When the rank is greater than zero then sym will be an array. */
if (sym->ts.type == BT_CLASS)
if (sym->ts.type == BT_CLASS && CLASS_DATA (sym))
{
if ((!CLASS_DATA (sym)->as && rank != 0)
|| (CLASS_DATA (sym)->as

3
gcc/fortran/resolve.c
View File

@ -8715,7 +8715,8 @@ resolve_assoc_var (gfc_symbol* sym, bool resolve_target)
{
/* target's rank is 0, but the type of the sym is still array valued,
which has to be corrected. */
if (sym->ts.type == BT_CLASS && CLASS_DATA (sym)->as)
if (sym->ts.type == BT_CLASS
&& CLASS_DATA (sym) && CLASS_DATA (sym)->as)
{
gfc_array_spec *as;
symbol_attribute attr;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-08 Steven G. Kargl <kargl@gcc.gnu.org>
* gfortran.dg/pr88357_1.f90: New test.
* gfortran.dg/pr88357_2.f90: New test.
2018-12-08 Jakub Jelinek <jakub@redhat.com>
PR fortran/88304

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

@ -0,0 +1,9 @@
! { dg-do compile }
! { dg-options "-fcoarray=single" }
program p
type t
end type
class(t) :: x[*] ! { dg-error "must be dummy, allocatable or pointer" }
associate (y => x)
end associate
end

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

@ -0,0 +1,8 @@
! { dg-do compile }
program p
type t
end type
class(t) :: x ! { dg-error "must be dummy, allocatable or pointer" }
associate (y => x)
end associate
end