From 8be59d19f27684eed54b611dcf68f590553d8386 Mon Sep 17 00:00:00 2001 From: Kugan Vivekanandarajah Date: Mon, 26 Sep 2016 18:16:23 +0000 Subject: [PATCH] re PR tree-optimization/77719 (ICE in pp_string, at pretty-print.c:955) Fix PR77719 gcc/testsuite/ChangeLog: 2016-09-26 Kugan Vivekanandarajah PR middle-end/77719 * gfortran.dg/pr77719.f90: New test. gcc/ChangeLog: 2016-09-26 Kugan Vivekanandarajah PR middle-end/77719 * tree-ssa-reassoc.c (make_new_ssa_for_def): Use gimple_get_lhs to get lhs instead of gimple_assign_lhs as stmt can be builtins too. From-SVN: r240505 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr77719.f90 | 26 ++++++++++++++++++++++++++ gcc/tree-ssa-reassoc.c | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr77719.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1c1620833e..0d529dee90e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-09-26 Kugan Vivekanandarajah + + PR middle-end/77719 + * tree-ssa-reassoc.c (make_new_ssa_for_def): Use gimple_get_lhs to get lhs + instead of gimple_assign_lhs as stmt can be builtins too. + 2016-09-26 Thomas Preud'homme * tree.h (memmodel_from_int, memmodel_base, is_mm_relaxed, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e2b54b9030d..b9b09967675 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-26 Kugan Vivekanandarajah + + PR middle-end/77719 + * gfortran.dg/pr77719.f90: New test. + 2016-09-26 Thomas Preud'homme * gcc.dg/tree-ssa/builtin-sprintf-warn-1.c: Adjust regex to accept diff --git a/gcc/testsuite/gfortran.dg/pr77719.f90 b/gcc/testsuite/gfortran.dg/pr77719.f90 new file mode 100644 index 00000000000..974d70a8dda --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr77719.f90 @@ -0,0 +1,26 @@ +! PR middle-end/77719 +! { dg-do compile } +! { dg-options "-O3 -ffast-math" } + +SUBROUTINE urep_egr(erep,derep,surr) + INTEGER, PARAMETER :: dp=8 + REAL(dp), INTENT(inout) :: erep, derep(3) + REAL(dp), INTENT(in) :: surr(2) + REAL(dp) :: de_z, rz + INTEGER :: isp,spdim,jsp,nsp + IF (n_urpoly > 0) THEN + IF (r < spxr(1,1)) THEN + ispg: DO isp = 1,spdim ! condition ca) + IF (isp /= spdim) THEN + nsp = 5 ! condition cb + DO jsp = 0,nsp + IF( jsp <= 3 ) THEN + ELSE + erep = erep + surr(jsp-3)*rz**(jsp) + ENDIF + END DO + END IF + END DO ispg + END IF + END IF +END SUBROUTINE urep_egr diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index 8fc76e4fb6f..d94ff70ebb0 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -1158,7 +1158,7 @@ make_new_ssa_for_def (gimple *stmt) use_operand_p use; imm_use_iterator iter; tree new_lhs; - tree lhs = gimple_assign_lhs (stmt); + tree lhs = gimple_get_lhs (stmt); new_lhs = make_ssa_name (TREE_TYPE (lhs)); gimple_set_lhs (stmt, new_lhs); -- 2.30.2