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

re PR fortran/88008 (ICE in check_typebound_baseobject, at fortran/resolve.c:6058)

Browse Source 
2019-03-17  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/88008
	* gfortran.h (expr_t): Add EXPR_UNKNOWN.
	* expr.c (gfc_copy_expr): Add EXPR_UNKNOWN to switch statement.
	(gfc_simplify_expr): Likewise.
	* module.c (mio_expr): Likewise.
	* resovle.c (extract_compcall_passed_object): Issue error on
	unknown type.
	(check_typebound_baseobject): Issue error on wrong type.
	* trans-expr.c (gfc_apply_interface_mapping_to_expr): Add
	EXPR_UNKNOWN to switch statement.

2019-03-17  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/88008
	 * gfortran.dg/typebound_call_31.f90: New test.

From-SVN: r269750
This commit is contained in:
Thomas Koenig 2019-03-18 07:28:42 +00:00
parent af52cce0af
commit 7e703f019b
8 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/fortran/ChangeLog
View File

@ -1,3 +1,16 @@
2019-03-17 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/88008
* gfortran.h (expr_t): Add EXPR_UNKNOWN.
* expr.c (gfc_copy_expr): Add EXPR_UNKNOWN to switch statement.
(gfc_simplify_expr): Likewise.
* module.c (mio_expr): Likewise.
* resovle.c (extract_compcall_passed_object): Issue error on
unknown type.
(check_typebound_baseobject): Issue error on wrong type.
* trans-expr.c (gfc_apply_interface_mapping_to_expr): Add
EXPR_UNKNOWN to switch statement.
2019-03-16 Jakub Jelinek <jakub@redhat.com>
PR fortran/89724

6
gcc/fortran/expr.c
View File

@ -390,6 +390,9 @@ gfc_copy_expr (gfc_expr *p)
case EXPR_VARIABLE:
case EXPR_NULL:
break;
case EXPR_UNKNOWN:
gcc_unreachable ();
}
q->shape = gfc_copy_shape (p->shape, p->rank);
@ -2206,6 +2209,9 @@ gfc_simplify_expr (gfc_expr *p, int type)
case EXPR_COMPCALL:
case EXPR_PPC:
break;
case EXPR_UNKNOWN:
gcc_unreachable ();
}
return true;

2
gcc/fortran/gfortran.h
View File

@ -142,7 +142,7 @@ enum gfc_source_form
/* Expression node types. */
enum expr_t
{ EXPR_OP = 1, EXPR_FUNCTION, EXPR_CONSTANT, EXPR_VARIABLE,
{ EXPR_UNKNOWN = 0, EXPR_OP = 1, EXPR_FUNCTION, EXPR_CONSTANT, EXPR_VARIABLE,
EXPR_SUBSTRING, EXPR_STRUCTURE, EXPR_ARRAY, EXPR_NULL, EXPR_COMPCALL, EXPR_PPC
};

1
gcc/fortran/module.c
View File

@ -3694,6 +3694,7 @@ mio_expr (gfc_expr **ep)
case EXPR_COMPCALL:
case EXPR_PPC:
case EXPR_UNKNOWN:
gcc_unreachable ();
break;
}

13
gcc/fortran/resolve.c
View File

@ -5945,6 +5945,13 @@ extract_compcall_passed_object (gfc_expr* e)
{
gfc_expr* po;
if (e->expr_type == EXPR_UNKNOWN)
{
gfc_error ("Error in typebound call at %L",
&e->where);
return NULL;
}
gcc_assert (e->expr_type == EXPR_COMPCALL);
if (e->value.compcall.base_object)
@ -6090,7 +6097,11 @@ check_typebound_baseobject (gfc_expr* e)
if (!base)
return false;
gcc_assert (base->ts.type == BT_DERIVED || base->ts.type == BT_CLASS);
if (base->ts.type != BT_DERIVED && base->ts.type != BT_CLASS)
{
gfc_error ("Error in typebound call at %L", &e->where);
goto cleanup;
}
if (base->ts.type == BT_CLASS && !gfc_expr_attr (base).class_ok)
return false;

1
gcc/fortran/trans-expr.c
View File

@ -4536,6 +4536,7 @@ gfc_apply_interface_mapping_to_expr (gfc_interface_mapping * mapping,
case EXPR_COMPCALL:
case EXPR_PPC:
case EXPR_UNKNOWN:
gcc_unreachable ();
break;
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2019-03-17 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/88008
* gfortran.dg/typebound_call_31.f90: New test.
2019-03-03-17 John David Anglin <danglin@gcc.gnu.org>
* gcc.dg/compat/pr83487-1_x.c: Use -fno-common option on hppa*-*-hpux*.

16
gcc/testsuite/gfortran.dg/typebound_call_31.f90 Normal file
View File

@ -0,0 +1,16 @@
! { dg-do compile }
! PR 88008 - this use to ICE. Original test case by
! Gerhard Steinmetz.
module m
type t
integer, pointer :: z
contains
procedure :: g
end type
contains
subroutine g(x)
class(t) :: x
call x%z%g() ! { dg-error "Error in typebound call" }
end
end