From 4c1bbd67f92676cc59d8ab173a12f14288d676fd Mon Sep 17 00:00:00 2001 From: Toon Moene Date: Mon, 24 Nov 2003 22:48:08 +0100 Subject: [PATCH] re PR fortran/12633 (logical expression gives incorrect result with -fugly-logint option) 2003-11-24 Toon Moene 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 --- gcc/f/ChangeLog | 7 +++++++ gcc/f/expr.c | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 1891718f9c4..0bc2791a1b2 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,10 @@ +2003-11-24 Toon Moene + + 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 * .cvsignore: Delete. diff --git a/gcc/f/expr.c b/gcc/f/expr.c index 6aeddafe4c2..f7ee46bb56b 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; }