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

class.c (build_vtbl_initializer): Don't shadow outer variable with static var.

Browse Source 
* class.c (build_vtbl_initializer): Don't shadow outer variable
	with static var.

From-SVN: r247747
This commit is contained in:
Nathan Sidwell 2017-05-08 16:58:44 +00:00 committed by Nathan Sidwell
parent 564cf83d79
commit 7574e45845
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2017-05-08 Nathan Sidwell <nathan@acm.org>
* class.c (build_vtbl_initializer): Don't shadow outer variable
with static var.
Revert _binding -> _value change.
* name-lookup.h (get_namespace_value, set_global_value): Rename to ...
(get_namespace_binding, set_global_binding): ... these.

14
gcc/cp/class.c
View File

@ -9769,18 +9769,19 @@ build_vtbl_initializer (tree binfo,
/* Likewise for deleted virtuals. */
else if (DECL_DELETED_FN (fn_original))
{
static tree fn;
static tree dvirt_fn;
if (!fn)
if (!dvirt_fn)
{
tree name = get_identifier ("__cxa_deleted_virtual");
fn = IDENTIFIER_GLOBAL_VALUE (name);
if (!fn)
fn = push_library_fn
dvirt_fn = IDENTIFIER_GLOBAL_VALUE (name);
if (!dvirt_fn)
dvirt_fn = push_library_fn
(name,
build_function_type_list (void_type_node, NULL_TREE),
NULL_TREE, ECF_NORETURN);
}
fn = dvirt_fn;
if (!TARGET_VTABLE_USES_DESCRIPTORS)
init = fold_convert (vfunc_ptr_type_node,
build_fold_addr_expr (fn));
@ -9789,7 +9790,8 @@ build_vtbl_initializer (tree binfo,
{
if (!integer_zerop (delta) || vcall_index)
{
fn = make_thunk (fn, /*this_adjusting=*/1, delta, vcall_index);
fn = make_thunk (fn, /*this_adjusting=*/1,
delta, vcall_index);
if (!DECL_NAME (fn))
finish_thunk (fn);
}