From fe8c7c6b9afbfdee7b7ee409b48c0fb719fa1204 Mon Sep 17 00:00:00 2001 From: kargl Date: Sun, 9 Dec 2018 16:32:48 +0000 Subject: [PATCH] 2018-12-09 Fritz Reese PR fortran/88228 * resolve.c (resolve_operator): Do not call resolve_function. Break like other cases. 2018-12-09 Steven G. Kargl PR fortran/88228 * gfortran.dg/pr88228.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266926 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 4 ++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr88228.f90 | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr88228.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e74bda7a1362..f37ca637fa01 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-12-09 Fritz Reese + + PR fortran/88228 + * resolve.c (resolve_operator): Do not call resolve_function. + Break like other cases. + 2018-12-09 Cesar Philippidis * trans-openmp.c (gfc_trans_oacc_combined_directive): Set the diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 949fe988fbf1..f4bf84b3349b 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4004,7 +4004,7 @@ resolve_operator (gfc_expr *e) if (op2->ts.type != e->ts.type || op2->ts.kind != e->ts.kind) gfc_convert_type (op2, &e->ts, 1); e = logical_to_bitwise (e); - return resolve_function (e); + break; } sprintf (msg, _("Operands of logical operator %%<%s%%> at %%L are %s/%s"), @@ -4020,7 +4020,7 @@ resolve_operator (gfc_expr *e) e->ts.type = BT_INTEGER; e->ts.kind = op1->ts.kind; e = logical_to_bitwise (e); - return resolve_function (e); + break; } if (op1->ts.type == BT_LOGICAL) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 19bc532c9d57..120fb9e13084 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-12-09 Steven G. Kargl + + PR fortran/88228 + * gfortran.dg/pr88228.f90: New test. + 2018-12-09 Thomas Schwinge * gfortran.dg/goacc/combined-directives-3.f90: New file. diff --git a/gcc/testsuite/gfortran.dg/pr88228.f90 b/gcc/testsuite/gfortran.dg/pr88228.f90 new file mode 100644 index 000000000000..cf5bbbe0ae83 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr88228.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! { dg-options "-fdec" } +! PR fortran/88228 +program p + integer :: n = .not. 1 + integer :: j = .true. .or. 1 +end + -- 2.47.2