diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-09-21 18:09:13 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-09-21 18:09:13 +0000 |
| commit | e2eb0806eaed00661cf7bc5b5d60798aa37dc712 (patch) | |
| tree | 61b47e6af47388b34ff18374cf6bc163e53d53aa /gcc/fortran/resolve.c | |
| parent | d7b00a16de70d84dce94a1f760265497f3408a7b (diff) | |
| download | gcc-e2eb0806eaed00661cf7bc5b5d60798aa37dc712.zip gcc-e2eb0806eaed00661cf7bc5b5d60798aa37dc712.tar.gz gcc-e2eb0806eaed00661cf7bc5b5d60798aa37dc712.tar.bz2 | |
re PR fortran/67615 (ICE on using arithmetic if with array instead of scalar)
2015-09-21 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67615
* resolve.c (gfc_resolve_code): Check for scalar expression in
arithmetic-if.
2015-09-21 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67615
* gfortran.dg/pr67615.f90: new test.
From-SVN: r227981
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a304158..da8aaa1 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -10377,15 +10377,18 @@ gfc_resolve_code (gfc_code *code, gfc_namespace *ns) } case EXEC_ARITHMETIC_IF: - if (t - && code->expr1->ts.type != BT_INTEGER - && code->expr1->ts.type != BT_REAL) - gfc_error ("Arithmetic IF statement at %L requires a numeric " - "expression", &code->expr1->where); + { + gfc_expr *e = code->expr1; - resolve_branch (code->label1, code); - resolve_branch (code->label2, code); - resolve_branch (code->label3, code); + if (t && (e->rank > 0 + || !(e->ts.type == BT_REAL || e->ts.type == BT_INTEGER))) + gfc_error ("Arithmetic IF statement at %L requires a scalar " + "REAL or INTEGER expression", &code->expr1->where); + + resolve_branch (code->label1, code); + resolve_branch (code->label2, code); + resolve_branch (code->label3, code); + } break; case EXEC_IF: |