Mercurial > hg > CbC > CbC_gcc
diff gcc/cfgbuild.c @ 67:f6334be47118
update gcc from gcc-4.6-20100522 to gcc-4.6-20110318
author | nobuyasu <dimolto@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Tue, 22 Mar 2011 17:18:12 +0900 |
parents | b7f97abdc517 |
children | 04ced10e8804 |
line wrap: on
line diff
--- a/gcc/cfgbuild.c Tue May 25 18:58:51 2010 +0900 +++ b/gcc/cfgbuild.c Tue Mar 22 17:18:12 2011 +0900 @@ -1,6 +1,6 @@ /* Control flow graph building code for GNU compiler. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -34,7 +34,7 @@ #include "function.h" #include "except.h" #include "expr.h" -#include "toplev.h" +#include "diagnostic-core.h" #include "timevar.h" #include "sbitmap.h" @@ -112,7 +112,7 @@ if (GET_CODE (PATTERN (insn)) == TRAP_IF && XEXP (PATTERN (insn), 0) == const1_rtx) return true; - if (!flag_non_call_exceptions) + if (!cfun->can_throw_non_call_exceptions) return false; break; @@ -333,7 +333,7 @@ handler for this CALL_INSN. If we're handling non-call exceptions then any insn can reach any of the active handlers. Also mark the CALL_INSN as reaching any nonlocal goto handler. */ - else if (code == CALL_INSN || flag_non_call_exceptions) + else if (code == CALL_INSN || cfun->can_throw_non_call_exceptions) { /* Add any appropriate EH edges. */ rtl_make_eh_edge (edge_cache, bb, insn);