From f1608bfca56f5ab4a7160c57d5179e59a7c4a197 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 14 Jun 2011 23:51:52 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 55a2d5d4928..01a596fd060 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-14 Jason Merrill + + * pt.c (deduction_tsubst_fntype): Don't save input_location. + (maybe_instantiate_noexcept): Likewise. + 2011-06-14 Joseph Myers * Make-lang.in (cp/method.o): Update dependencies. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 814a08f6a4e..5f53ce88cfc 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); -- 2.30.2