procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use proper DECL_INITIAL for VTV

Browse source 
gcc/cp/ChangeLog:

	* vtable-class-hierarchy.cc (vtv_generate_init_routine): Emit
	an artificial variable that would be put into .preinit_array
	section.

gcc/ChangeLog:

	* output.h (assemble_vtv_preinit_initializer): Remove.
	* varasm.cc (assemble_vtv_preinit_initializer): Remove.
This commit is contained in:
Martin Liska 2022-10-13 15:39:08 +02:00
parent 6cc3394507
commit fc748d47e9
3 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gcc/cp/vtable-class-hierarchy.cc
View file

@ -1192,8 +1192,18 @@ vtv_generate_init_routine (void)
cgraph_node::add_new_function (vtv_fndecl, false);
if (flag_vtable_verify == VTV_PREINIT_PRIORITY && !TARGET_PECOFF)
assemble_vtv_preinit_initializer (vtv_fndecl);
{
tree vtv_var
= build_decl (BUILTINS_LOCATION, VAR_DECL,
get_identifier ("__vtv_preinit"),
build_pointer_type (TREE_TYPE (vtv_fndecl)));
TREE_STATIC (vtv_var) = 1;
DECL_ARTIFICIAL (vtv_var) = 1;
DECL_INITIAL (vtv_var) = build_fold_addr_expr (vtv_fndecl);
set_decl_section_name (vtv_var, ".preinit_array");
varpool_node::add (vtv_var);
}
}
pop_lang_context ();
}

4
gcc/output.h
View file

@ -199,10 +199,6 @@ extern void assemble_end_function (tree, const char *);
initial value (that will be done by the caller). */
extern void assemble_variable (tree, int, int, int);
/* Put the vtable verification constructor initialization function
into the preinit array. */
extern void assemble_vtv_preinit_initializer (tree);
/* Assemble everything that is needed for a variable declaration that has
no definition in the current translation unit. */
extern void assemble_undefined_decl (tree);

17
gcc/varasm.cc
View file

@ -2419,23 +2419,6 @@ assemble_variable (tree decl, int top_level ATTRIBUTE_UNUSED,
}
}
/* Given a function declaration (FN_DECL), this function assembles the
function into the .preinit_array section. */
void
assemble_vtv_preinit_initializer (tree fn_decl)
{
section *sect;
unsigned flags = SECTION_WRITE;
rtx symbol = XEXP (DECL_RTL (fn_decl), 0);
flags |= SECTION_NOTYPE;
sect = get_section (".preinit_array", flags, fn_decl);
switch_to_section (sect);
assemble_addr_to_section (symbol, sect);
}
/* Return 1 if type TYPE contains any pointers. */
static int