From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Sun, 9 Dec 2018 18:32:01 +0000 (+0000)
Subject: [multiple changes]
X-Git-Tag: releases/gcc-7.5.0~737
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1703682cc56663888a2affc7643d8c68b8a1c55e;p=thirdparty%2Fgcc.git

[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 67a14cf3954e..055b7faf6f94 100644
--- 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 06d98da636d5..85e93870642c 100644
--- 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 8ca9a4e67144..8fb2c4787365 100644
--- 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
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
+