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.

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

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 1891718f9c452a4267021fa23f72adb38cee7a26..0bc2791a1b2207f7420becf74642317f139c63fb 100644 (file)
--- 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 6aeddafe4c27099ca05ae2cab26123551fdf3115..f7ee46bb56bf3ec87e0f28473bb92cf32c880415 100644 (file)
--- 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;
 }