From: Tobias Burnus Date: Thu, 6 Jun 2013 16:45:04 +0000 (+0200) Subject: backport: re PR fortran/54370 (error: non-trivial conversion in unary operation) X-Git-Tag: releases/gcc-4.7.4~631 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60ef4024952d005b0799c56e1e212ece03d38b62;p=thirdparty%2Fgcc.git backport: re PR fortran/54370 (error: non-trivial conversion in unary operation) 2013-06-06 Tobias Burnus Backport from mainline 2012-08-27 Tobias Burnus PR fortran/54370 * trans-stmt.c (gfc_trans_do_while): Don't change the logical kind for negation of the condition. 2013-06-06 Tobias Burnus Backport from mainline 2012-08-27 Tobias Burnus PR fortran/54370 * gfortran.dg/do_5.f90: New. From-SVN: r199746 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7f6fa7a3e7cf..f76ec6bf284c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2013-06-06 Tobias Burnus + + Backport from mainline + 2012-08-27 Tobias Burnus + + PR fortran/54370 + * trans-stmt.c (gfc_trans_do_while): Don't change the logical + kind for negation of the condition. + 2013-06-01 Janus Weil Tobias Burnus diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 630816ed4015..b8914f3dc43a 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -1743,7 +1743,7 @@ gfc_trans_do_while (gfc_code * code) gfc_conv_expr_val (&cond, code->expr1); gfc_add_block_to_block (&block, &cond.pre); cond.expr = fold_build1_loc (code->expr1->where.lb->location, - TRUTH_NOT_EXPR, boolean_type_node, cond.expr); + TRUTH_NOT_EXPR, TREE_TYPE (cond.expr), cond.expr); /* Build "IF (! cond) GOTO exit_label". */ tmp = build1_v (GOTO_EXPR, exit_label); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d156c635db75..f80afa0ad46c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2013-06-06 Tobias Burnus + + Backport from mainline + 2012-08-27 Tobias Burnus + + PR fortran/54370 + * gfortran.dg/do_5.f90: New. + 2013-06-01 Janus Weil Tobias Burnus diff --git a/gcc/testsuite/gfortran.dg/do_5.f90 b/gcc/testsuite/gfortran.dg/do_5.f90 new file mode 100644 index 000000000000..107a35a139db --- /dev/null +++ b/gcc/testsuite/gfortran.dg/do_5.f90 @@ -0,0 +1,29 @@ +! { dg-do compile } +! +! PR fortran/54370 +! +! The following program was ICEing at tree-check time +! "L()" was regarded as default-kind logical. +! +! Contributed by Kirill Chilikin +! + MODULE M + CONTAINS + + LOGICAL(C_BOOL) FUNCTION L() BIND(C) + USE, INTRINSIC :: ISO_C_BINDING + L = .FALSE. + END FUNCTION + + LOGICAL(8) FUNCTION L2() BIND(C) ! { dg-warning "may not be a C interoperable kind but it is bind" } + L2 = .FALSE._8 + END FUNCTION + + SUBROUTINE S() + DO WHILE (L()) + ENDDO + DO WHILE (L2()) + ENDDO + END + + END