From b5241a5a9c5e34639b97aa3d488f021d96eafb4d Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Thu, 28 Aug 2014 19:03:22 +0000 Subject: Convert nonlocal_goto_handler_labels from an EXPR_LIST to an INSN_LIST gcc/ 2014-08-28 David Malcolm * function.h (struct rtl_data): Convert field "x_nonlocal_goto_handler_labels" from rtx_expr_list * to rtx_insn_list *. * rtl.h (remove_node_from_insn_list): New prototype. * builtins.c (expand_builtin): When prepending to nonlocal_goto_handler_labels, use gen_rtx_INSN_LIST rather than gen_rtx_EXPR_LIST. * cfgbuild.c (make_edges): Convert local "x" from rtx_expr_list * to rtx_insn_list *, and use its "insn" method rather than "element" method. * cfgrtl.c (delete_insn): Use new function remove_node_from_insn_list rather than remove_node_from_expr_list. (cfg_layout_initialize): Convert local "x" from rtx_expr_list * to rtx_insn_list *, and use its "insn" method rather than "element" method. * dwarf2cfi.c (create_trace_edges): Likewise for local "lab". * reload1.c (set_initial_label_offsets): Likewise for local "x". * rtlanal.c (remove_node_from_insn_list): New function, adapted from remove_node_from_expr_list. * stmt.c (expand_label): When prepending to nonlocal_goto_handler_labels, use gen_rtx_INSN_LIST rather than gen_rtx_EXPR_LIST. From-SVN: r214687 --- gcc/dwarf2cfi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/dwarf2cfi.c') diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index 2452824..7c495e4 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -2338,10 +2338,10 @@ create_trace_edges (rtx insn) /* Process non-local goto edges. */ if (can_nonlocal_goto (insn)) - for (rtx_expr_list *lab = nonlocal_goto_handler_labels; + for (rtx_insn_list *lab = nonlocal_goto_handler_labels; lab; lab = lab->next ()) - maybe_record_trace_start_abnormal (lab->element (), insn); + maybe_record_trace_start_abnormal (lab->insn (), insn); } else if (rtx_sequence *seq = dyn_cast (PATTERN (insn))) { -- cgit v1.1