OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR fortran/54370 (error: non-trivial conversion in unary operation) 

2013-06-06  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2012-08-27  Tobias Burnus  <burnus@net-b.de>

        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  <burnus@net-b.de>

        Backport from mainline
        2012-08-27  Tobias Burnus  <burnus@net-b.de>

        PR fortran/54370
        * gfortran.dg/do_5.f90: New.

From-SVN: r199746
This commit is contained in:
Tobias Burnus 2013-06-06 18:45:04 +02:00 committed by Tobias Burnus
parent 8519a634a7
commit 60ef402495
4 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View File

@ -1,3 +1,12 @@
2013-06-06 Tobias Burnus <burnus@net-b.de>
Backport from mainline
2012-08-27 Tobias Burnus <burnus@net-b.de>
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 <janus@gcc.gnu.org>
Tobias Burnus <burnus@net-b.de>

2
gcc/fortran/trans-stmt.c
View File

@ -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);

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2013-06-06 Tobias Burnus <burnus@net-b.de>
Backport from mainline
2012-08-27 Tobias Burnus <burnus@net-b.de>
PR fortran/54370
* gfortran.dg/do_5.f90: New.
2013-06-01 Janus Weil <janus@gcc.gnu.org>
Tobias Burnus <burnus@net-b.de>

29
gcc/testsuite/gfortran.dg/do_5.f90 Normal file
View File

@ -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