git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/88116 (ICE in gfc_convert_constant(): Unexpected type) 

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

	PR fortran/88116
	PR fortran/88467
	* array.c (gfc_match_array_constructor): Check return value of
	gfc_convert_type().  Skip constructor elements with BT_UNKNOWN,
	which need to go through resolution.
	* intrinsic.c (gfc_convert_type_warn): Return early if the types
	martch (i.e., no conversion is required).
	* simplify.c (gfc_convert_constant): Remove a gfc_internal_error,
	and return gfc_bad_expr.

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

	PR fortran/88116
	* gfortran.dg/pr88116_1.f90: New test.
	* gfortran.dg/pr88116_2.f90: Ditto.

	PR fortran/88467
	* gfortran.dg/pr88467.f90: New test.

From-SVN: r267189
This commit is contained in:
Steven G. Kargl 2018-12-16 16:29:43 +00:00
parent 26ca4e0587
commit e9b75848c3
8 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/fortran/ChangeLog
View File

@ -1,3 +1,15 @@
2018-12-16 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/88116
PR fortran/88467
* array.c (gfc_match_array_constructor): Check return value of
gfc_convert_type(). Skip constructor elements with BT_UNKNOWN,
which need to go through resolution.
* intrinsic.c (gfc_convert_type_warn): Return early if the types
match (i.e., no conversion is required).
* simplify.c (gfc_convert_constant): Remove a gfc_internal_error,
and return gfc_bad_expr.
2018-12-16 Steven G. Kargl <kargl@gcc.gnu.org>
* decl.c (variable_decl): Typo fixes in comment and error messsage.

4
gcc/fortran/array.c
View File

@ -1246,7 +1246,9 @@ done:
{
c = gfc_constructor_first (head);
for (; c; c = gfc_constructor_next (c))
gfc_convert_type (c->expr, &ts, 1);
if (!gfc_convert_type (c->expr, &ts, 1)
&& c->expr->ts.type != BT_UNKNOWN)
return MATCH_ERROR;
}
}
else

7
gcc/fortran/intrinsic.c
View File

@ -5030,6 +5030,13 @@ gfc_convert_type_warn (gfc_expr *expr, gfc_typespec *ts, int eflag, int wflag)
if (expr->ts.type == BT_UNKNOWN)
goto bad;
/* In building an array constructor, gfortran can end up here when no
conversion is required for an intrinsic type. We need to let derived
types drop through. */
if (from_ts.type != BT_DERIVED
&& (from_ts.type == ts->type && from_ts.kind == ts->kind))
return true;
if (expr->ts.type == BT_DERIVED && ts->type == BT_DERIVED
&& gfc_compare_types (&expr->ts, ts))
return true;

2
gcc/fortran/simplify.c
View File

@ -8360,7 +8360,7 @@ gfc_convert_constant (gfc_expr *e, bt type, int kind)
default:
oops:
gfc_internal_error ("gfc_convert_constant(): Unexpected type");
return &gfc_bad_expr;
}
result = NULL;

9
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2018-12-16 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/88116
* gfortran.dg/pr88116_1.f90: New test.
* gfortran.dg/pr88116_2.f90: Ditto.
PR fortran/88467
* gfortran.dg/pr88467.f90: New test.
2018-12-16 Steven G. Kargl <kargl@gcc.gnu.org>
* gfortran.dg/pr88138.f90: Remove extraneous 's' in comment.

4
gcc/testsuite/gfortran.dg/pr88116_1.f90 Normal file
View File

@ -0,0 +1,4 @@
! { dg-do compile }
program p
print *, [integer :: 1, [integer(8) :: 2, ['3']]] ! { dg-error "Can't convert" }
end

7
gcc/testsuite/gfortran.dg/pr88116_2.f90 Normal file
View File

@ -0,0 +1,7 @@
! { dg-do run }
program p
real :: a(2) = [real :: 1, [integer :: (real(k), k=2,1), 2]]
real :: b(1) = [real :: [integer :: (dble(k), k=1,0), 2]]
if (a(1) /= 1. .or. a(2) /= 2. .or. b(1) /= 2.) stop 1
end

4
gcc/testsuite/gfortran.dg/pr88467.f90 Normal file
View File

@ -0,0 +1,4 @@
! { dg-do compile }
program foo
print *, [integer :: 1, [integer(8) :: 2, '3']] ! { dg-error "Can't convert" }
end program foo