Message ID | 80a87b62-c193-2309-332d-22b1949d3e91@linaro.org |
---|---|
State | New |
Headers | show |
On 09/25/2016 08:39 PM, kugan wrote: > > > On 25/09/16 04:50, kugan wrote: >> Hi, >> >> In make_new_ssa_for_def (tree-reassoc.c) we should use gimple_get_lhs to >> get lhs instead of gimple_assign_lhs as stmt can be builtins too. >> Attached patch fixes this. >> >> Testcase from PR (attached) seems to fail. I dont any fortran so I didnt >> try fixing it. Any help here is appreciate. The log is: > > Here is a patch with the testcase based on the feedback from Joost > VandeVondele and Dominique d'Humieres. Bootstrapped and regression > tested on x86_64-linux-gnu with no new regressions. > > Is this OK for trunk? > > Thanks, > kugan > > gcc/testsuite/ChangeLog: > > 2016-09-25 Kugan Vivekanandarajah <kuganv@linaro.org> > > * gfortran.dg/pr77719.f90: New test. > > gcc/ChangeLog: > > 2016-09-25 Kugan Vivekanandarajah <kuganv@linaro.org> > > * 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. > OK. jeff
diff --git a/gcc/testsuite/gfortran.dg/pr77719.f90 b/gcc/testsuite/gfortran.dg/pr77719.f90 index e69de29..974d70a 100644 --- a/gcc/testsuite/gfortran.dg/pr77719.f90 +++ 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 8fc76e4..d94ff70 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);