Commit 2a42f4aa by Richard Guenther Committed by Richard Biener

tree.c (cp_walk_subtrees): Do not set input_location.

2007-03-29  Richard Guenther  <rguenther@suse.de>

	* tree.c (cp_walk_subtrees): Do not set input_location.

From-SVN: r123329
parent cab6e771
2007-03-29 Richard Guenther <rguenther@suse.de>
* tree.c (cp_walk_subtrees): Do not set input_location.
2007-03-28 Simon Martin <simartin@users.sourceforge.net> 2007-03-28 Simon Martin <simartin@users.sourceforge.net>
PR c++/29077 PR c++/29077
......
...@@ -2203,7 +2203,6 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func, ...@@ -2203,7 +2203,6 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func,
void *data, struct pointer_set_t *pset) void *data, struct pointer_set_t *pset)
{ {
enum tree_code code = TREE_CODE (*tp); enum tree_code code = TREE_CODE (*tp);
location_t save_locus;
tree result; tree result;
#define WALK_SUBTREE(NODE) \ #define WALK_SUBTREE(NODE) \
...@@ -2214,12 +2213,6 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func, ...@@ -2214,12 +2213,6 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func,
} \ } \
while (0) 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 /* Not one of the easy cases. We must explicitly go through the
children. */ children. */
result = NULL_TREE; result = NULL_TREE;
...@@ -2301,13 +2294,11 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func, ...@@ -2301,13 +2294,11 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func,
break; break;
default: default:
input_location = save_locus;
return NULL_TREE; return NULL_TREE;
} }
/* We didn't find what we were looking for. */ /* We didn't find what we were looking for. */
out: out:
input_location = save_locus;
return result; return result;
#undef WALK_SUBTREE #undef WALK_SUBTREE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment