From: Toon Moene <toon@moene.indiv.nluug.nl>
Date: Mon, 24 Nov 2003 21:48:08 +0000 (+0100)
Subject: re PR fortran/12633 (logical expression gives incorrect result with -fugly-logint... 
X-Git-Tag: releases/gcc-3.4.0~2119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c1bbd67f92676cc59d8ab173a12f14288d676fd;p=thirdparty%2Fgcc.git

re PR fortran/12633 (logical expression gives incorrect result with -fugly-logint option)

2003-11-24  Toon Moene  <toon@moene.indiv.nluug.nl>

	PR fortran/12633
	* expr.c (ffeexpr_reduced_ugly2log_): Revert
	change allowing logical .and. logical to be
	integer in expressions when -fugly-logint.

From-SVN: r73898
---

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 1891718f9c45..0bc2791a1b22 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-24  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+	PR fortran/12633
+	* expr.c (ffeexpr_reduced_ugly2log_): Revert
+	change allowing logical .and. logical to be
+	integer in expressions when -fugly-logint.
+
 2003-11-21  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* .cvsignore: Delete.
diff --git a/gcc/f/expr.c b/gcc/f/expr.c
index 6aeddafe4c27..f7ee46bb56bf 100644
--- a/gcc/f/expr.c
+++ b/gcc/f/expr.c
@@ -10593,24 +10593,6 @@ ffeexpr_reduced_ugly2log_ (ffebld reduced, ffeexprExpr_ l, ffeexprExpr_ op,
       /* else Leave it alone. */
     }
 
-  if (lbt == FFEINFO_basictypeLOGICAL)
-  {
-	  ffebld_set_left (reduced, ffeexpr_convert (ffebld_left (reduced),
-				  l->token, op->token, FFEINFO_basictypeINTEGER,
-				  FFEINFO_kindtypeINTEGERDEFAULT, 0,
-				  FFETARGET_charactersizeNONE,
-				  FFEEXPR_contextLET));
-  }
-
-  if (rbt == FFEINFO_basictypeLOGICAL)
-  {
-	  ffebld_set_right (reduced, ffeexpr_convert (ffebld_right (reduced),
-				  r->token, op->token, FFEINFO_basictypeINTEGER,
-				  FFEINFO_kindtypeINTEGERDEFAULT, 0,
-				  FFETARGET_charactersizeNONE,
-				  FFEEXPR_contextLET));
-  }
-
   return reduced;
 }