diff options
author | Ben Cheng <bccheng@google.com> | 2013-08-05 15:18:29 -0700 |
---|---|---|
committer | Ben Cheng <bccheng@google.com> | 2013-08-05 16:03:48 -0700 |
commit | 32fce3edda831e36ee484406c39dffbe0230f257 (patch) | |
tree | 733b1b5398304b260a4ee3d5d9b17da5038c5486 /gcc-4.8/gcc/tree-eh.c | |
parent | e85b9ca2afe8edbb9fa99c6ce2cc4e52dce18c21 (diff) | |
download | toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.gz toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.bz2 toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.zip |
[4.8] Merge GCC 4.8.1
Change-Id: Ic8a60b7563f5172440fd40788605163a0cca6e30
Diffstat (limited to 'gcc-4.8/gcc/tree-eh.c')
-rw-r--r-- | gcc-4.8/gcc/tree-eh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc-4.8/gcc/tree-eh.c b/gcc-4.8/gcc/tree-eh.c index 6b9dac925..973782ba5 100644 --- a/gcc-4.8/gcc/tree-eh.c +++ b/gcc-4.8/gcc/tree-eh.c @@ -1855,7 +1855,8 @@ lower_eh_must_not_throw (struct leh_state *state, gimple tp) this_region = gen_eh_region_must_not_throw (state->cur_region); this_region->u.must_not_throw.failure_decl = gimple_eh_must_not_throw_fndecl (inner); - this_region->u.must_not_throw.failure_loc = gimple_location (tp); + this_region->u.must_not_throw.failure_loc + = LOCATION_LOCUS (gimple_location (tp)); /* In order to get mangling applied to this decl, we must mark it used now. Otherwise, pass_ipa_free_lang_data won't think it |