Mercurial > hg > CbC > CbC_gcc
diff gcc/except.c @ 63:b7f97abdc517 gcc-4.6-20100522
update gcc from gcc-4.5.0 to gcc-4.6
| author | ryoma <e075725@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 24 May 2010 12:47:05 +0900 |
| parents | 77e2b8dfacca |
| children | f6334be47118 |
line wrap: on
line diff
--- a/gcc/except.c Fri Feb 12 23:41:23 2010 +0900 +++ b/gcc/except.c Mon May 24 12:47:05 2010 +0900 @@ -1,6 +1,6 @@ /* Implements exception handling. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Mike Stump <mrs@cygnus.com>. @@ -139,6 +139,7 @@ #include "langhooks.h" #include "cgraph.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-pass.h" #include "timevar.h" #include "tree-flow.h" @@ -153,9 +154,6 @@ to the given failure handler. */ tree (*lang_protect_cleanup_actions) (void); -/* Return true if type A catches type B. */ -int (*lang_eh_type_covers) (tree a, tree b); - static GTY(()) int call_site_base; static GTY ((param_is (union tree_node))) htab_t type_to_runtime_map; @@ -974,6 +972,7 @@ lp->landing_pad = gen_label_rtx (); emit_label (lp->landing_pad); + LABEL_PRESERVE_P (lp->landing_pad) = 1; #ifdef HAVE_exception_receiver if (HAVE_exception_receiver) @@ -1154,7 +1153,7 @@ #ifdef DONT_USE_BUILTIN_SETJMP { - rtx x; + rtx x, last; x = emit_library_call_value (setjmp_libfunc, NULL_RTX, LCT_RETURNS_TWICE, TYPE_MODE (integer_type_node), 1, plus_constant (XEXP (fc, 0), @@ -1162,7 +1161,12 @@ emit_cmp_and_jump_insns (x, const0_rtx, NE, 0, TYPE_MODE (integer_type_node), 0, dispatch_label); - add_reg_br_prob_note (get_insns (), REG_BR_PROB_BASE/100); + last = get_last_insn (); + if (JUMP_P (last) && any_condjump_p (last)) + { + gcc_assert (!find_reg_note (last, REG_BR_PROB, 0)); + add_reg_note (last, REG_BR_PROB, GEN_INT (REG_BR_PROB_BASE / 100)); + } } #else expand_builtin_setjmp_setup (plus_constant (XEXP (fc, 0), sjlj_fc_jbuf_ofs),