aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/arith.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2018-03-10 18:34:12 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2018-03-10 18:34:12 +0000
commit7d2fb01c0ad6962eee602d076938ce9a65f54918 (patch)
tree0e9c7c23f9bc06e84bd48e7b87cc6b35cb49a7d2 /gcc/fortran/arith.c
parentb3231b65bb70b49ee89460c4a53cadab87116ec8 (diff)
downloadgcc-7d2fb01c0ad6962eee602d076938ce9a65f54918.zip
gcc-7d2fb01c0ad6962eee602d076938ce9a65f54918.tar.gz
gcc-7d2fb01c0ad6962eee602d076938ce9a65f54918.tar.bz2
re PR fortran/84734 (Compiling codes with insane array dimensions gives an ICE after r257971)
2018-03-09 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/84734 * arith.c (check_result, eval_intrinsic): If result overflows, pass the expression up the chain instead of a NULL pointer. 2018-03-09 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/84734 * gfortran.dg/pr84734.f90: New test. From-SVN: r258416
Diffstat (limited to 'gcc/fortran/arith.c')
-rw-r--r--gcc/fortran/arith.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 8f328fe..6f97d0f 100644
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -555,10 +555,10 @@ check_result (arith rc, gfc_expr *x, gfc_expr *r, gfc_expr **rp)
val = ARITH_OK;
}
- if (val != ARITH_OK)
- gfc_free_expr (r);
- else
+ if (val == ARITH_OK || val == ARITH_OVERFLOW)
*rp = r;
+ else
+ gfc_free_expr (r);
return val;
}
@@ -1603,9 +1603,13 @@ eval_intrinsic (gfc_intrinsic_op op,
if (rc != ARITH_OK)
{
gfc_error (gfc_arith_error (rc), &op1->where);
+ if (rc == ARITH_OVERFLOW)
+ goto done;
return NULL;
}
+done:
+
gfc_free_expr (op1);
gfc_free_expr (op2);
return result;