aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/expr.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2017-05-15 19:34:52 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2017-05-15 19:34:52 +0000
commit0735a1c8cf2fe23ade2f98e5dbaf1781f597471d (patch)
tree9fe2401ed1ff43daebd779abf81572730c35c658 /gcc/fortran/expr.c
parent900b5b6af2ed3b1e2e43f6d253c8ebac8e0de273 (diff)
downloadgcc-0735a1c8cf2fe23ade2f98e5dbaf1781f597471d.zip
gcc-0735a1c8cf2fe23ade2f98e5dbaf1781f597471d.tar.gz
gcc-0735a1c8cf2fe23ade2f98e5dbaf1781f597471d.tar.bz2
re PR fortran/80752 (ICE with wrong type initialization)
2017-05-15 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/80752 * expr.c (gfc_generate_initializer): If type conversion fails, check for error and return NULL. 2017-05-15 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/80752 gfortran.dg/pr80752.f90: New test. From-SVN: r248072
Diffstat (limited to 'gcc/fortran/expr.c')
-rw-r--r--gcc/fortran/expr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index c8be951..c7d3e54 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4395,7 +4395,12 @@ gfc_generate_initializer (gfc_typespec *ts, bool generate)
if ((comp->ts.type != tmp->ts.type
|| comp->ts.kind != tmp->ts.kind)
&& !comp->attr.pointer && !comp->attr.proc_pointer)
- gfc_convert_type_warn (ctor->expr, &comp->ts, 2, false);
+ {
+ bool val;
+ val = gfc_convert_type_warn (ctor->expr, &comp->ts, 1, false);
+ if (val == false)
+ return NULL;
+ }
}
if (comp->attr.allocatable