From 79c7fda6d56eea84a95df8ea67387b4cf972e9de Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 3 Mar 2014 08:25:50 +0100 Subject: re PR middle-end/60175 (ICE on gcc.dg/asan/nosanitize-and-inline.c) PR middle-end/60175 * function.c (expand_function_end): Don't emit clobber_return_register sequence if clobber_after is a BARRIER. * cfgexpand.c (construct_exit_block): Append instructions before return_label to prev_bb. From-SVN: r208267 --- gcc/function.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gcc/function.c') diff --git a/gcc/function.c b/gcc/function.c index b43e67f..e67d3c1 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -5156,17 +5156,20 @@ expand_function_end (void) crtl->return_rtx = outgoing; } - /* Emit the actual code to clobber return register. */ - { - rtx seq; + /* Emit the actual code to clobber return register. Don't emit + it if clobber_after is a barrier, then the previous basic block + certainly doesn't fall thru into the exit block. */ + if (!BARRIER_P (clobber_after)) + { + rtx seq; - start_sequence (); - clobber_return_register (); - seq = get_insns (); - end_sequence (); + start_sequence (); + clobber_return_register (); + seq = get_insns (); + end_sequence (); - emit_insn_after (seq, clobber_after); - } + emit_insn_after (seq, clobber_after); + } /* Output the label for the naked return from the function. */ if (naked_return_label) -- cgit v1.1