This corresponds to: [PATCH 50/89] Make gimple_phi_arg_set_location require a gimple_phi https://gcc.gnu.org/ml/gcc-patches/2014-04/msg01163.html from the original 89-patch kit
That earlier patch was approved by Jeff: > OK once prerequisites have gone in. in https://gcc.gnu.org/ml/gcc-patches/2014-05/msg00811.html gcc/ * gimple.h (gimple_phi_arg_set_location): Require a gimple_phi rather than a plain gimple. --- gcc/ChangeLog.gimple-classes | 7 +++++++ gcc/gimple.h | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog.gimple-classes b/gcc/ChangeLog.gimple-classes index a162b12..f7d2c73 100644 --- a/gcc/ChangeLog.gimple-classes +++ b/gcc/ChangeLog.gimple-classes @@ -1,5 +1,12 @@ 2014-10-24 David Malcolm <dmalc...@redhat.com> + Make gimple_phi_arg_set_location require a gimple_phi + + * gimple.h (gimple_phi_arg_set_location): Require a gimple_phi + rather than a plain gimple. + +2014-10-24 David Malcolm <dmalc...@redhat.com> + Make add_phi_arg require a gimple_phi * tree-phinodes.h (add_phi_arg): Require a gimple_phi rather than diff --git a/gcc/gimple.h b/gcc/gimple.h index e4ebcff..5e49d97 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -4003,12 +4003,12 @@ gimple_phi_arg_location_from_edge (gimple gs, edge e) return gimple_phi_arg (gs, e->dest_idx)->locus; } -/* Set the source location of gimple argument I of phi node GS to LOC. */ +/* Set the source location of gimple argument I of phi node PHI to LOC. */ static inline void -gimple_phi_arg_set_location (gimple gs, size_t i, source_location loc) +gimple_phi_arg_set_location (gimple_phi phi, size_t i, source_location loc) { - gimple_phi_arg (gs, i)->locus = loc; + gimple_phi_arg (phi, i)->locus = loc; } /* Return TRUE if argument I of phi node PHI has a location record. */ -- 1.8.5.3
