[PATCH] Fix -Og and TER
Richard Biener
rguenther@suse.de
Thu Mar 7 15:52:00 GMT 2013
We need to avoid line-jumps due to TER, like we do for -O0.
This also adjust things to match the 4.8 changes for location
encodings (and the older PHI argument locations).
Bootstrap & regtest pending on x86_64-unknown-linux-gnu.
Does this look ok?
Thanks,
Richard.
2013-03-07 Richard Biener <rguenther@suse.de>
* tree-ssa-ter.c (is_replaceable_p): Do not TER across location
or block changes with -Og. Fix for location / block encoding
changes and PHI arguments with locations.
Index: gcc/tree-ssa-ter.c
===================================================================
*** gcc/tree-ssa-ter.c (revision 196520)
--- gcc/tree-ssa-ter.c (working copy)
*************** is_replaceable_p (gimple stmt, bool ter)
*** 399,420 ****
return false;
locus1 = gimple_location (stmt);
! block1 = gimple_block (stmt);
if (gimple_code (use_stmt) == GIMPLE_PHI)
! {
! locus2 = 0;
! block2 = NULL_TREE;
! }
else
! {
! locus2 = gimple_location (use_stmt);
! block2 = gimple_block (use_stmt);
! }
! if (!optimize
&& ter
! && ((locus1 && locus1 != locus2) || (block1 && block1 != block2)))
return false;
/* Used in this block, but at the TOP of the block, not the end. */
--- 400,421 ----
return false;
locus1 = gimple_location (stmt);
! block1 = LOCATION_BLOCK (locus1);
! locus1 = LOCATION_LOCUS (locus1);
if (gimple_code (use_stmt) == GIMPLE_PHI)
! locus2 = gimple_phi_arg_location (use_stmt, PHI_ARG_INDEX_FROM_USE (use_p));
else
! locus2 = gimple_location (use_stmt);
! block2 = LOCATION_BLOCK (locus2);
! locus2 = LOCATION_LOCUS (locus2);
! if ((!optimize || optimize_debug)
&& ter
! && ((locus1 != UNKNOWN_LOCATION
! && locus1 != locus2)
! || (block1 != NULL_TREE
! && block1 != block2)))
return false;
/* Used in this block, but at the TOP of the block, not the end. */
More information about the Gcc-patches
mailing list