From 2a42f4aa198bf06b093a76d38dd29a49324d904e Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 29 Mar 2007 12:55:14 +0000 Subject: [PATCH] tree.c (cp_walk_subtrees): Do not set input_location. 2007-03-29 Richard Guenther * tree.c (cp_walk_subtrees): Do not set input_location. From-SVN: r123329 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/tree.c | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4f2b06191ef..bf5e28c272e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2007-03-29 Richard Guenther + + * tree.c (cp_walk_subtrees): Do not set input_location. + 2007-03-28 Simon Martin PR c++/29077 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index d334a689e29..7fd6664a8c6 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2203,7 +2203,6 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func, void *data, struct pointer_set_t *pset) { enum tree_code code = TREE_CODE (*tp); - location_t save_locus; tree result; #define WALK_SUBTREE(NODE) \ @@ -2214,12 +2213,6 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func, } \ while (0) - /* Set input_location here so we get the right instantiation context - if we call instantiate_decl from inlinable_function_p. */ - save_locus = input_location; - if (EXPR_HAS_LOCATION (*tp)) - input_location = EXPR_LOCATION (*tp); - /* Not one of the easy cases. We must explicitly go through the children. */ result = NULL_TREE; @@ -2301,13 +2294,11 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func, break; default: - input_location = save_locus; return NULL_TREE; } /* We didn't find what we were looking for. */ out: - input_location = save_locus; return result; #undef WALK_SUBTREE