r193176 - in /branches/google/gcc-4_7/gcc: Chan...

[dehao@gcc.gnu.org]

Author: dehao
Date: Mon Nov  5 18:17:41 2012
New Revision: 193176

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=193176
Log:
2012-11-05  Dehao Chen  <dehao@google.com>

	Backport 193169, 193137 and 193053 from trunk:

	* tree-eh.c (do_return_redirection): Set location for jump statement.
	(do_goto_redirection): Likewise.
	(frob_into_branch_around): Likewise.
	(lower_try_finally_nofallthru): Likewise.
	(lower_try_finally_copy): Likewise.
	(lower_try_finally_switch): Likewise.
	* expr.c (store_expr): Use current insn location instead of expr
	location.
	(expand_expr_real): Likewise.
	(expand_expr_real_1): Likewise.
	* cfglayout.c (reemit_insn_block_notes): Do not change scope if insn
	location is UNKNOWN_LOCATION.

Modified:
    branches/google/gcc-4_7/gcc/ChangeLog.google-4_7
    branches/google/gcc-4_7/gcc/cfglayout.c
    branches/google/gcc-4_7/gcc/expr.c
    branches/google/gcc-4_7/gcc/tree-eh.c