From 7d2fb01c0ad6962eee602d076938ce9a65f54918 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Sat, 10 Mar 2018 18:34:12 +0000 Subject: [PATCH] re PR fortran/84734 (Compiling codes with insane array dimensions gives an ICE after r257971) 2018-03-09 Steven G. Kargl 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 PR fortran/84734 * gfortran.dg/pr84734.f90: New test. From-SVN: r258416 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/arith.c | 10 +++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr84734.f90 | 4 ++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr84734.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 796b58dd6f3..d4042189ab3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-03-10 Steven G. Kargl + + 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-07 Steven G. Kargl PR fortran/64124 diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index 8f328fe4c52..6f97d0f9784 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; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bf028b86a22..323e8360781 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-10 Steven G. Kargl + + PR fortran/84734 + * gfortran.dg/pr84734.f90: New test. + 2018-03-10 Eric Botcazou * gnat.dg/prot3.adb: New test. diff --git a/gcc/testsuite/gfortran.dg/pr84734.f90 b/gcc/testsuite/gfortran.dg/pr84734.f90 new file mode 100644 index 00000000000..4b117ae43e7 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr84734.f90 @@ -0,0 +1,4 @@ +! { dg-do compile } +! PR fortran/84734 + integer :: b(huge(1_8)+1_8) = 0 ! { dg-error "Arithmetic overflow" } + end -- 2.30.2