diff options
| author | Jason Merrill <jason@redhat.com> | 2011-06-14 23:51:52 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-06-14 23:51:52 -0400 |
| commit | f1608bfca56f5ab4a7160c57d5179e59a7c4a197 (patch) | |
| tree | c700fef2cdeaada5f317dfe0f2eadf24617b4f6a | |
| parent | c76e43bc7335a81853c6f6b57f539b9cbec08dcb (diff) | |
| download | gcc-f1608bfca56f5ab4a7160c57d5179e59a7c4a197.zip gcc-f1608bfca56f5ab4a7160c57d5179e59a7c4a197.tar.gz gcc-f1608bfca56f5ab4a7160c57d5179e59a7c4a197.tar.bz2 | |
pt.c (deduction_tsubst_fntype): Don't save input_location.
* pt.c (deduction_tsubst_fntype): Don't save input_location.
(maybe_instantiate_noexcept): Likewise.
From-SVN: r175072
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 55a2d5d..01a596f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-14 Jason Merrill <jason@redhat.com> + + * pt.c (deduction_tsubst_fntype): Don't save input_location. + (maybe_instantiate_noexcept): Likewise. + 2011-06-14 Joseph Myers <joseph@codesourcery.com> * Make-lang.in (cp/method.o): Update dependencies. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 814a08f..5f53ce8 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13635,7 +13635,6 @@ deduction_tsubst_fntype (tree fn, tree targs) { static bool excessive_deduction_depth; static int deduction_depth; - location_t save_loc = input_location; struct pending_template *old_last_pend = last_pending_template; tree fntype = TREE_TYPE (fn); @@ -13659,7 +13658,6 @@ deduction_tsubst_fntype (tree fn, tree targs) r = tsubst (fntype, targs, tf_none, NULL_TREE); pop_deduction_access_scope (fn); --deduction_depth; - input_location = save_loc; if (excessive_deduction_depth) { @@ -17359,7 +17357,6 @@ maybe_instantiate_noexcept (tree fn) tree fntype = TREE_TYPE (fn); tree spec = TYPE_RAISES_EXCEPTIONS (fntype); tree noex = NULL_TREE; - location_t saved_loc = input_location; tree clone; if (!DEFERRED_NOEXCEPT_SPEC_P (spec)) @@ -17373,7 +17370,6 @@ maybe_instantiate_noexcept (tree fn) DEFERRED_NOEXCEPT_ARGS (noex), tf_warning_or_error, fn, /*function_p=*/false, /*integral_constant_expression_p=*/true); - input_location = saved_loc; pop_access_scope (fn); pop_tinst_level (); spec = build_noexcept_spec (noex, tf_warning_or_error); |