From f913ff2adc41a6f8dec64efffbbfb3ee9bb4464b Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sat, 7 Apr 2018 23:52:03 +0000 Subject: [PATCH] re PR middle-end/82976 (Error: non-trivial conversion at assignment since r254526) 2018-04-07 Thomas Koenig Andrew Pinski PR middle-end/82976 * match.pd: Use constant_boolean_node of correct type instead of boolean_true_node or boolean_false_node for simplifying pointer comparisons to zero. 2018-04-07 Thomas Koenig PR middle-end/82976 * gfortran.dg/realloc_on_assign_16a.f90: New test. Co-Authored-By: Andrew Pinski From-SVN: r259212 --- gcc/ChangeLog | 8 +++++ gcc/match.pd | 2 +- gcc/testsuite/ChangeLog | 5 ++++ .../gfortran.dg/realloc_on_assign_16a.f90 | 29 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/realloc_on_assign_16a.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a2639748679..2430cce0968 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-04-07 Thomas Koenig + Andrew Pinski + + PR middle-end/82976 + * match.pd: Use constant_boolean_node of correct type instead of + boolean_true_node or boolean_false_node for simplifying + pointer comparisons to zero. + 2018-04-07 Jakub Jelinek PR tree-optimization/80021 diff --git a/gcc/match.pd b/gcc/match.pd index 02753c0f85c..1bbf09f96f0 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -3700,7 +3700,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (neeq @0 @1) (if (POINTER_TYPE_P (TREE_TYPE (@0)) && ptrs_compare_unequal (@0, @1)) - { neeq == EQ_EXPR ? boolean_false_node : boolean_true_node; }))) + { constant_boolean_node (neeq != EQ_EXPR, type); }))) /* PR70920: Transform (intptr_t)x eq/ne CST to x eq/ne (typeof x) CST. and (typeof ptr_cst) x eq/ne ptr_cst to x eq/ne (typeof x) CST. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 00ac96fca36..08a80f15e99 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-07 Thomas Koenig + + PR middle-end/82976 + * gfortran.dg/realloc_on_assign_16a.f90: New test. + 2018-04-07 Jakub Jelinek PR tree-optimization/85257 diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_16a.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_16a.f90 new file mode 100644 index 00000000000..9d16d6caf71 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_16a.f90 @@ -0,0 +1,29 @@ +! { dg-do compile } +! { dg-options "-Ofast -fno-tree-forwprop" } +! Test that PR 82976 is fixed, this used to ICE. +! +! Contributed by Stefan Mauerberger +! +PROGRAM main + !USE MPI + + TYPE :: test_typ + REAL, ALLOCATABLE :: a(:) + END TYPE + + TYPE(test_typ) :: xx, yy + TYPE(test_typ), ALLOCATABLE :: conc(:) + + !CALL MPI_INIT(i) + + xx = test_typ( [1.0,2.0] ) + yy = test_typ( [4.0,4.9] ) + + conc = [ xx, yy ] + + if (any (int (10.0*conc(1)%a) .ne. [10,20])) STOP 1 + if (any (int (10.0*conc(2)%a) .ne. [40,49])) STOP 2 + + !CALL MPI_FINALIZE(i) + +END PROGRAM main -- 2.30.2