[multiple changes]

2018-12-09  Fritz Reese  <fritzoreese@gmail.com>

	PR fortran/88228
	* resolve.c (resolve_operator):  Do not call resolve_function.
	Break like other cases.

2018-12-09  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/88228
	* gfortran.dg/pr88228.f90: New test.

From-SVN: r266928

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 67a14cf3954e412d9dfa5bdeda079e323ac083ef..055b7faf6f9459dfdad143e747b515cab3ae0f22 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-09  Fritz Reese  <fritzoreese@gmail.com>
+
+       PR fortran/88228
+       * resolve.c (resolve_operator):  Do not call resolve_function.
+       Break like other cases.
+
 2018-12-06  Release Manager
 
        * GCC 7.4.0 released.

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 06d98da636d505acf5dea9c52d980e7fdc3326d3..85e93870642c9c5d0fb7e2b158250576d33638d2 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -3737,7 +3737,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"),
@@ -3753,7 +3753,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 8ca9a4e671445fb17bb9519698f854bc99e18aaf..8fb2c478736542ef0f541294e385edd632c17b03 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/88228
+       * gfortran.dg/pr88228.f90: New test.
+
 2018-12-06  Release Manager
 
        * GCC 7.4.0 released.

diff --git a/gcc/testsuite/gfortran.dg/pr88228.f90 b/gcc/testsuite/gfortran.dg/pr88228.f90
new file mode 100644 (file)
index 0000000..cf5bbbe
--- /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
+