This corresponds to: [PATCH 60/89] Concretize gimple_catch_types https://gcc.gnu.org/ml/gcc-patches/2014-04/msg01195.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/msg00816.html gcc/ * gimple.h (gimple_catch_types): Require a const_gimple_catch rather than a const_gimple. --- gcc/ChangeLog.gimple-classes | 7 +++++++ gcc/gimple.h | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog.gimple-classes b/gcc/ChangeLog.gimple-classes index dd735af..d2bc077 100644 --- a/gcc/ChangeLog.gimple-classes +++ b/gcc/ChangeLog.gimple-classes @@ -1,5 +1,12 @@ 2014-10-24 David Malcolm <dmalc...@redhat.com> + Concretize gimple_catch_types + + * gimple.h (gimple_catch_types): Require a const_gimple_catch + rather than a const_gimple. + +2014-10-24 David Malcolm <dmalc...@redhat.com> + Make gimple_goto_set_dest require a gimple_goto * gimple.h (gimple_goto_set_dest): Require a gimple_goto. diff --git a/gcc/gimple.h b/gcc/gimple.h index fc80407..18cfcec 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -3522,13 +3522,11 @@ gimple_asm_input_p (const_gimple_asm asm_stmt) } -/* Return the types handled by GIMPLE_CATCH statement GS. */ +/* Return the types handled by GIMPLE_CATCH statement CATCH_STMT. */ static inline tree -gimple_catch_types (const_gimple gs) +gimple_catch_types (const_gimple_catch catch_stmt) { - const gimple_statement_catch *catch_stmt = - as_a <const gimple_statement_catch *> (gs); return catch_stmt->types; } -- 1.8.5.3