During untangling the name change made sense. But didn't at the final
outcome, so I've reverted it. Sorry for the churn.
nathan
--
Nathan Sidwell
2017-05-11 Nathan Sidwell <nat...@acm.org>
Revert pushdecl_top_level_and_finish name change.
* name-lookup.h (pushdecl_top_level_and_finish): Resurrect old name.
* name-lookup.c (pushdecl_top_level_and_finish): Likewise.
* decl.c (cp_make_fname_decl): Adjust.
* decl2.c (get_guard, handle_tls_init): Adjust.
* rtti.c (get_tinfo_decl, tinfo_base_init): Adjust.
Index: decl.c
===================================================================
--- decl.c (revision 247912)
+++ decl.c (working copy)
@@ -4342,7 +4342,7 @@ cp_make_fname_decl (location_t loc, tree
else
{
DECL_THIS_STATIC (decl) = true;
- pushdecl_top_level_with_init (decl, init);
+ pushdecl_top_level_and_finish (decl, init);
}
return decl;
Index: decl2.c
===================================================================
--- decl2.c (revision 247912)
+++ decl2.c (working copy)
@@ -3021,7 +3021,7 @@ get_guard (tree decl)
DECL_ARTIFICIAL (guard) = 1;
DECL_IGNORED_P (guard) = 1;
TREE_USED (guard) = 1;
- pushdecl_top_level_with_init (guard, NULL_TREE);
+ pushdecl_top_level_and_finish (guard, NULL_TREE);
}
return guard;
}
@@ -4261,7 +4261,7 @@ handle_tls_init (void)
TREE_USED (guard) = true;
CP_DECL_THREAD_LOCAL_P (guard) = true;
set_decl_tls_model (guard, decl_default_tls_model (guard));
- pushdecl_top_level_with_init (guard, NULL_TREE);
+ pushdecl_top_level_and_finish (guard, NULL_TREE);
tree fn = get_local_tls_init_fn ();
start_preparsed_function (fn, NULL_TREE, SF_PRE_PARSED);
Index: name-lookup.c
===================================================================
--- name-lookup.c (revision 247912)
+++ name-lookup.c (working copy)
@@ -4586,7 +4586,7 @@ pushdecl_top_level_maybe_friend (tree x,
initializing it with INIT. */
tree
-pushdecl_top_level_with_init (tree x, tree init)
+pushdecl_top_level_and_finish (tree x, tree init)
{
return pushdecl_top_level_1 (x, &init, false);
}
Index: name-lookup.h
===================================================================
--- name-lookup.h (revision 247912)
+++ name-lookup.h (working copy)
@@ -340,7 +340,7 @@ extern tree pushdecl (tree);
extern tree pushdecl_outermost_localscope (tree);
extern tree pushdecl_top_level_maybe_friend (tree, bool is_friend);
extern tree pushdecl_top_level (tree);
-extern tree pushdecl_top_level_with_init (tree, tree);
+extern tree pushdecl_top_level_and_finish (tree, tree);
extern tree pushtag (tree, tree, tag_scope);
extern bool push_namespace (tree);
extern void pop_namespace (void);
Index: rtti.c
===================================================================
--- rtti.c (revision 247912)
+++ rtti.c (working copy)
@@ -445,7 +445,7 @@ get_tinfo_decl (tree type)
DECL_NOT_REALLY_EXTERN (d) = 1;
set_linkage_according_to_type (type, d);
- d = pushdecl_top_level_with_init (d, NULL_TREE);
+ d = pushdecl_top_level_and_finish (d, NULL_TREE);
if (CLASS_TYPE_P (type))
CLASSTYPE_TYPEINFO_VAR (TYPE_MAIN_VARIANT (type)) = d;
@@ -911,7 +911,7 @@ tinfo_base_init (tinfo_s *ti, tree targe
name_string = tinfo_name (target, !TREE_PUBLIC (name_decl));
DECL_INITIAL (name_decl) = name_string;
mark_used (name_decl);
- pushdecl_top_level_with_init (name_decl, name_string);
+ pushdecl_top_level_and_finish (name_decl, name_string);
}
vtable_ptr = ti->vtable;
