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

2003-12-05  Toon Moene  <toon@moene.indiv.nluug.nl>

	PR fortran/12633
	Revert 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.

From-SVN: r74343

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index d88c6537208aa0516d0705705575cdbba2595570..cd6f75df136fa4515d2831dab118104bfe6ae1a5 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-05  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+       PR fortran/12633
+       Revert 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.
+
 2003-10-16  Release Manager
 
        * GCC 3.3.2 Released.

diff --git a/gcc/f/expr.c b/gcc/f/expr.c
index 4824be7cdb35801ea228ec21d138375782794d0a..985f494f304f08efd03ca7bc426f1d394e7f6d3f 100644 (file)
--- a/gcc/f/expr.c
+++ b/gcc/f/expr.c
@@ -11502,24 +11502,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;
 }