From: toon <toon@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 9 May 2002 09:11:58 +0000 (+0000)
Subject: 2002-05-09  Hassan Aurag  <aurag@cae.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15784945774c60cae920eb2153c6e14e70dc754d;p=thirdparty%2Fgcc.git

2002-05-09  Hassan Aurag  <aurag@cae.com>

	* expr.c (ffeexpr_reduced_ugly2log_): Allow logicals-as-integers
	under -fugly-logint as arguments of .and., .or., .xor.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53321 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 364408f5b903..1f14f907510f 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-09  Hassan Aurag  <aurag@cae.com>
+
+	* expr.c (ffeexpr_reduced_ugly2log_): Allow logicals-as-integers
+	under -fugly-logint as arguments of .and., .or., .xor.
+
 2002-05-07  Jan Hubicka  <jh@suse.cz>
 
 	* target.h (FFETARGET_32bit_longs): Undefine for x86-64.
diff --git a/gcc/f/expr.c b/gcc/f/expr.c
index 1772727bd857..a63ae30424e7 100644
--- a/gcc/f/expr.c
+++ b/gcc/f/expr.c
@@ -11501,6 +11501,24 @@ 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;
 }