This corresponds to: [PATCH 64/89] Concretize gimple_try_set_catch_is_cleanup https://gcc.gnu.org/ml/gcc-patches/2014-04/msg01181.html from the original 89-patch kit
That earlier patch was approved by Jeff: > OK after prerequisites have gone in. in https://gcc.gnu.org/ml/gcc-patches/2014-05/msg00818.html gcc/ * gimple.h (gimple_try_set_catch_is_cleanup): Require a gimple_try. * gimplify.c (gimplify_expr): Convert local "try_" from a gimple to a gimple_try. --- gcc/ChangeLog.gimple-classes | 9 +++++++++ gcc/gimple.h | 2 +- gcc/gimplify.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog.gimple-classes b/gcc/ChangeLog.gimple-classes index ba0f5c1..b874697 100644 --- a/gcc/ChangeLog.gimple-classes +++ b/gcc/ChangeLog.gimple-classes @@ -1,5 +1,14 @@ 2014-10-24 David Malcolm <dmalc...@redhat.com> + Concretize gimple_try_set_catch_is_cleanup + + * gimple.h (gimple_try_set_catch_is_cleanup): Require a gimple_try. + + * gimplify.c (gimplify_expr): Convert local "try_" from a gimple + to a gimple_try. + +2014-10-24 David Malcolm <dmalc...@redhat.com> + Concretize gimple_eh_filter_set_types and gimple_eh_filter_set_failure * gimple.h (gimple_eh_filter_set_types): Require a gimple_eh_filter. diff --git a/gcc/gimple.h b/gcc/gimple.h index 79ee8ba..990e90d 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -3775,7 +3775,7 @@ gimple_try_cleanup (gimple gs) /* Set the GIMPLE_TRY_CATCH_IS_CLEANUP flag. */ static inline void -gimple_try_set_catch_is_cleanup (gimple g, bool catch_is_cleanup) +gimple_try_set_catch_is_cleanup (gimple_try g, bool catch_is_cleanup) { gcc_gimple_checking_assert (gimple_try_kind (g) == GIMPLE_TRY_CATCH); if (catch_is_cleanup) diff --git a/gcc/gimplify.c b/gcc/gimplify.c index e3da6ae..b49aab7 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7993,7 +7993,7 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, case TRY_CATCH_EXPR: { gimple_seq eval, cleanup; - gimple try_; + gimple_try try_; /* Calls to destructors are generated automatically in FINALLY/CATCH block. They should have location as UNKNOWN_LOCATION. However, -- 1.8.5.3
