OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pt.c (deduction_tsubst_fntype): Don't save input_location.

Browse Source 
* pt.c (deduction_tsubst_fntype): Don't save input_location.
	(maybe_instantiate_noexcept): Likewise.

From-SVN: r175072
This commit is contained in:
Jason Merrill 2011-06-14 23:51:52 -04:00 committed by Jason Merrill
parent c76e43bc73
commit f1608bfca5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -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.

4
gcc/cp/pt.c
View File

@ -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);