c35cce41da
Correct many new ABI issues regarding vbase and vcall offset layout. * cp-tree.h (BINFO_VTABLE): Document. (struct lang_type): Tweak formatting. (BINFO_PRIMARY_BINFO): Add to documentation. (CLASSTYPE_VSIZE): Fix typo in comment. (CLASSTYPE_VBASECLASSES): Update documentation. (BINFO_VBASE_MARKED): Remove. (SET_BINFO_VBASE_MARKED): Likewise. (CLEAR_BINFO_VBASE_MARKED): Likewise. (BINFO_FIELDS_MARKED): Remove. (SET_BINFO_FIELDS_MARKED): Likewise. (CLEAR_BINFO_FIELDS_MARKED): Likewise. (enum access_kind): New enumeration. (num_extra_vtbl_entries): Remove declaration. (size_extra_vtbl_entries): Likewise. (get_vtbl_decl_for_binfo): New function. (dfs_vbase_unmark): Remove declaration. (mark_primary_bases): Likewise. * class.c (SAME_FN): Remove. (struct vcall_offset_data_s): Move definition. (build_vbase_pointer): Use `build', not `build_binary_op', to access the vbase pointer under the new ABI. (build_vtable_entry_ref): Use get_vtbl_decl_for_binfo. (build_primary_vtable): Likewise. (dfs_mark_primary_bases): Move here from search.c. (mark_primary_bases): Likewise. (determine_primary_bases): Under the new ABI, don't make a base class a primary base just because we don't yet have any virtual functions. (layout_vtable_decl): Use get_vtbl_decl_for_binfo. (num_vfun_entries): Remove. (dfs_count_virtuals): Likewise. (num_extra_vtbl_entries): Likewise. (size_extra_vtbl_entries): Likewise. (layout_virtual_bases): Iterate in inheritance graph order under the new ABI. (finish_struct_1): Use TYPE_VFIELD, not CLASSTYPE_VSIZE, to indicate that a vfield is present. (init_class_processing): Initialize access_public_node, etc., from ak_public, etc. (get_vtbl_decl_for_binfo): New function. (dump_class_hierarchy_r): Likewise. (dump_class_hierarchy): Use it. (finish_vtbls): Build the vtbls in inheritance graph order. (dfs_finish_vtbls): Adjust call to build_vtbl_initializer. (initialize_vtable): Use get_vtbl_decl_for_binfo. (accumulate_vtbl_inits): Add comments explaining why a pre-order walk is required. (dfs_accumulate_vtbl_inits): Set BINFO_VTABLE to the location where the vptr points, even for primary vtables. (build_vtbl_initializer): Adjust handling of vbase and vcall offsets. (build_vcall_and_vbase_vtable_entries): New function. (dfs_build_vbase_offset_vtbl_entries): Remove. (build_vbase_offset_vtbl_entries): Reimplement. (dfs_build_vcall_offset_vtbl_entries): Don't include virtuals that were already handled in a primary base class vtable. (build_vcall_offset_vtbl_entries): Adjust. (build_rtti_vtbl_entries): Adjust. * decl2.c (output_vtable_inherit): Use get_vtbl_decl_for_binfo. * init.c (expand_virtual_init): Simplify. * repo.c (repo_get_id): Use get_vtbl_decl_for_binfo. * rtti.c (create_pseudo_type_info): Adjust calculation of vptr. * search.c (BINFO_ACCESS): New macro. (SET_BINFO_ACCESS): Likewise. (dfs_access_in_type): Manipulate access_kinds, not access nodes. (access_in_type): Likewise. (dfs_accessible_p): Likewise. (protected_accessible_p): Likewise. (lookup_fnfields_1): Adjust documentation. (dfs_mark_primary_bases): Move to class.c (mark_primary_bases): Likewise. (dfs_vbase_unmark): Remove. (virtual_context): Use BINFO_FOR_VBASE. (dfs_get_vbase_types): Simplify. (dfs_build_inheritance_graph_order): New function. (get_vbase_types): Use it. * tree.c (debug_binfo): Use get_vtbl_decl_for_binfo. * tinfo.cc (get_vbase_offset): New function. (__vmi_class_type_info::do_find_public_src): Use it. (__vmi_class_type_info::do_dyncast): Likewise. (__vmi_class_type_info::do_upcast): Likewise. From-SVN: r32905
450 lines
9.4 KiB
C
450 lines
9.4 KiB
C
/* Code to maintain a C++ template repository.
|
|
Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
|
|
Contributed by Jason Merrill (jason@cygnus.com)
|
|
|
|
This file is part of GNU CC.
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU CC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU CC; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/* My strategy here is as follows:
|
|
|
|
Everything should be emitted in a translation unit where it is used.
|
|
The results of the automatic process should be easily reproducible with
|
|
explicit code. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "tree.h"
|
|
#include "cp-tree.h"
|
|
#include "input.h"
|
|
#include "obstack.h"
|
|
#include "toplev.h"
|
|
#include "ggc.h"
|
|
|
|
static tree repo_get_id PARAMS ((tree));
|
|
static char *extract_string PARAMS ((char **));
|
|
static char *get_base_filename PARAMS ((const char *));
|
|
static void open_repo_file PARAMS ((const char *));
|
|
static char *afgets PARAMS ((FILE *));
|
|
static void reopen_repo_file_for_write PARAMS ((void));
|
|
|
|
static tree pending_repo;
|
|
static tree original_repo;
|
|
static char *repo_name;
|
|
static FILE *repo_file;
|
|
|
|
static char *old_args, *old_dir, *old_main;
|
|
|
|
extern int flag_use_repository;
|
|
extern struct obstack temporary_obstack;
|
|
extern struct obstack permanent_obstack;
|
|
|
|
#define IDENTIFIER_REPO_USED(NODE) (TREE_LANG_FLAG_3 (NODE))
|
|
#define IDENTIFIER_REPO_CHOSEN(NODE) (TREE_LANG_FLAG_4 (NODE))
|
|
|
|
#if 0
|
|
/* Record the flags used to compile this translation unit. */
|
|
|
|
void
|
|
repo_compile_flags (argc, argv)
|
|
int argc;
|
|
char **argv;
|
|
{
|
|
}
|
|
|
|
/* If this template has not been seen before, add a note to the repository
|
|
saying where the declaration was. This may be used to find the
|
|
definition at link time. */
|
|
|
|
void
|
|
repo_template_declared (t)
|
|
tree t;
|
|
{}
|
|
|
|
/* Note where the definition of a template lives so that instantiations can
|
|
be generated later. */
|
|
|
|
void
|
|
repo_template_defined (t)
|
|
tree t;
|
|
{}
|
|
|
|
/* Note where the definition of a class lives to that template
|
|
instantiations can use it. */
|
|
|
|
void
|
|
repo_class_defined (t)
|
|
tree t;
|
|
{}
|
|
#endif
|
|
|
|
static tree
|
|
repo_get_id (t)
|
|
tree t;
|
|
{
|
|
if (TYPE_P (t))
|
|
{
|
|
/* If we're not done setting up the class, we may not have set up
|
|
the vtable, so going ahead would give the wrong answer.
|
|
See g++.pt/instantiate4.C. */
|
|
if (!COMPLETE_TYPE_P (t) || TYPE_BEING_DEFINED (t))
|
|
my_friendly_abort (981113);
|
|
|
|
t = get_vtbl_decl_for_binfo (TYPE_BINFO (t));
|
|
if (t == NULL_TREE)
|
|
return t;
|
|
}
|
|
return DECL_ASSEMBLER_NAME (t);
|
|
}
|
|
|
|
/* Note that a template has been used. If we can see the definition, offer
|
|
to emit it. */
|
|
|
|
void
|
|
repo_template_used (t)
|
|
tree t;
|
|
{
|
|
tree id;
|
|
|
|
if (! flag_use_repository)
|
|
return;
|
|
|
|
id = repo_get_id (t);
|
|
if (id == NULL_TREE)
|
|
return;
|
|
|
|
if (TYPE_P (t))
|
|
{
|
|
if (IDENTIFIER_REPO_CHOSEN (id))
|
|
mark_class_instantiated (t, 0);
|
|
}
|
|
else if (DECL_P (t))
|
|
{
|
|
if (IDENTIFIER_REPO_CHOSEN (id))
|
|
mark_decl_instantiated (t, 0);
|
|
}
|
|
else
|
|
my_friendly_abort (1);
|
|
|
|
if (! IDENTIFIER_REPO_USED (id))
|
|
{
|
|
IDENTIFIER_REPO_USED (id) = 1;
|
|
pending_repo = tree_cons (NULL_TREE, id, pending_repo);
|
|
}
|
|
}
|
|
|
|
#if 0
|
|
/* Note that the vtable for a class has been used, and offer to emit it. */
|
|
|
|
static void
|
|
repo_vtable_used (t)
|
|
tree t;
|
|
{
|
|
if (! flag_use_repository)
|
|
return;
|
|
|
|
pending_repo = tree_cons (NULL_TREE, t, pending_repo);
|
|
}
|
|
|
|
/* Note that an inline with external linkage has been used, and offer to
|
|
emit it. */
|
|
|
|
void
|
|
repo_inline_used (fn)
|
|
tree fn;
|
|
{
|
|
if (! flag_use_repository)
|
|
return;
|
|
|
|
/* Member functions of polymorphic classes go with their vtables. */
|
|
if (DECL_FUNCTION_MEMBER_P (fn)
|
|
&& TYPE_POLYMORPHIC_P (DECL_CONTEXT (fn)))
|
|
{
|
|
repo_vtable_used (DECL_CONTEXT (fn));
|
|
return;
|
|
}
|
|
|
|
pending_repo = tree_cons (NULL_TREE, fn, pending_repo);
|
|
}
|
|
|
|
/* Note that a particular typeinfo node has been used, and offer to
|
|
emit it. */
|
|
|
|
void
|
|
repo_tinfo_used (ti)
|
|
tree ti;
|
|
{
|
|
}
|
|
#endif
|
|
|
|
void
|
|
repo_template_instantiated (t, extern_p)
|
|
tree t;
|
|
int extern_p;
|
|
{
|
|
if (! extern_p)
|
|
{
|
|
tree id = repo_get_id (t);
|
|
if (id)
|
|
IDENTIFIER_REPO_CHOSEN (id) = 1;
|
|
}
|
|
}
|
|
|
|
/* Parse a reasonable subset of shell quoting syntax. */
|
|
|
|
static char *
|
|
extract_string (pp)
|
|
char **pp;
|
|
{
|
|
char *p = *pp;
|
|
int backquote = 0;
|
|
int inside = 0;
|
|
|
|
for (;;)
|
|
{
|
|
char c = *p;
|
|
if (c == '\0')
|
|
break;
|
|
++p;
|
|
if (backquote)
|
|
obstack_1grow (&temporary_obstack, c);
|
|
else if (! inside && c == ' ')
|
|
break;
|
|
else if (! inside && c == '\\')
|
|
backquote = 1;
|
|
else if (c == '\'')
|
|
inside = !inside;
|
|
else
|
|
obstack_1grow (&temporary_obstack, c);
|
|
}
|
|
|
|
obstack_1grow (&temporary_obstack, '\0');
|
|
*pp = p;
|
|
return obstack_finish (&temporary_obstack);
|
|
}
|
|
|
|
static char *
|
|
get_base_filename (filename)
|
|
const char *filename;
|
|
{
|
|
char *p = getenv ("COLLECT_GCC_OPTIONS");
|
|
char *output = NULL;
|
|
int compiling = 0;
|
|
|
|
while (p && *p)
|
|
{
|
|
char *q = extract_string (&p);
|
|
|
|
if (strcmp (q, "-o") == 0)
|
|
output = extract_string (&p);
|
|
else if (strcmp (q, "-c") == 0)
|
|
compiling = 1;
|
|
}
|
|
|
|
if (compiling && output)
|
|
return output;
|
|
|
|
if (p && ! compiling)
|
|
{
|
|
warning ("-frepo must be used with -c");
|
|
flag_use_repository = 0;
|
|
return NULL;
|
|
}
|
|
|
|
return file_name_nondirectory (filename);
|
|
}
|
|
|
|
static void
|
|
open_repo_file (filename)
|
|
const char *filename;
|
|
{
|
|
register const char *p;
|
|
const char *s = get_base_filename (filename);
|
|
|
|
if (s == NULL)
|
|
return;
|
|
|
|
p = file_name_nondirectory (s);
|
|
p = rindex (p, '.');
|
|
if (! p)
|
|
p = s + strlen (s);
|
|
|
|
obstack_grow (&permanent_obstack, s, p - s);
|
|
repo_name = obstack_copy0 (&permanent_obstack, ".rpo", 4);
|
|
|
|
repo_file = fopen (repo_name, "r");
|
|
}
|
|
|
|
static char *
|
|
afgets (stream)
|
|
FILE *stream;
|
|
{
|
|
int c;
|
|
while ((c = getc (stream)) != EOF && c != '\n')
|
|
obstack_1grow (&temporary_obstack, c);
|
|
if (obstack_object_size (&temporary_obstack) == 0)
|
|
return NULL;
|
|
obstack_1grow (&temporary_obstack, '\0');
|
|
return obstack_finish (&temporary_obstack);
|
|
}
|
|
|
|
void
|
|
init_repo (filename)
|
|
const char *filename;
|
|
{
|
|
char *buf;
|
|
|
|
if (! flag_use_repository)
|
|
return;
|
|
|
|
ggc_add_tree_root (&pending_repo, 1);
|
|
ggc_add_tree_root (&original_repo, 1);
|
|
|
|
open_repo_file (filename);
|
|
|
|
if (repo_file == 0)
|
|
return;
|
|
|
|
while ((buf = afgets (repo_file)))
|
|
{
|
|
switch (buf[0])
|
|
{
|
|
case 'A':
|
|
old_args = obstack_copy0 (&permanent_obstack, buf + 2,
|
|
strlen (buf + 2));
|
|
break;
|
|
case 'D':
|
|
old_dir = obstack_copy0 (&permanent_obstack, buf + 2,
|
|
strlen (buf + 2));
|
|
break;
|
|
case 'M':
|
|
old_main = obstack_copy0 (&permanent_obstack, buf + 2,
|
|
strlen (buf + 2));
|
|
break;
|
|
case 'C':
|
|
case 'O':
|
|
{
|
|
tree id = get_identifier (buf + 2);
|
|
tree orig;
|
|
|
|
if (buf[0] == 'C')
|
|
{
|
|
IDENTIFIER_REPO_CHOSEN (id) = 1;
|
|
orig = integer_one_node;
|
|
}
|
|
else
|
|
orig = NULL_TREE;
|
|
|
|
original_repo = tree_cons (orig, id, original_repo);
|
|
}
|
|
break;
|
|
default:
|
|
error ("mysterious repository information in %s", repo_name);
|
|
}
|
|
obstack_free (&temporary_obstack, buf);
|
|
}
|
|
}
|
|
|
|
static void
|
|
reopen_repo_file_for_write ()
|
|
{
|
|
if (repo_file)
|
|
fclose (repo_file);
|
|
repo_file = fopen (repo_name, "w");
|
|
|
|
if (repo_file == 0)
|
|
{
|
|
error ("can't create repository information file `%s'", repo_name);
|
|
flag_use_repository = 0;
|
|
}
|
|
}
|
|
|
|
/* Emit any pending repos. */
|
|
|
|
void
|
|
finish_repo ()
|
|
{
|
|
tree t;
|
|
int repo_changed = 0;
|
|
char *dir, *args;
|
|
|
|
if (! flag_use_repository)
|
|
return;
|
|
|
|
/* Do we have to write out a new info file? */
|
|
|
|
/* Are there any old templates that aren't used any longer or that are
|
|
newly chosen? */
|
|
|
|
for (t = original_repo; t; t = TREE_CHAIN (t))
|
|
{
|
|
if (! IDENTIFIER_REPO_USED (TREE_VALUE (t))
|
|
|| (! TREE_PURPOSE (t) && IDENTIFIER_REPO_CHOSEN (TREE_VALUE (t))))
|
|
{
|
|
repo_changed = 1;
|
|
break;
|
|
}
|
|
IDENTIFIER_REPO_USED (TREE_VALUE (t)) = 0;
|
|
}
|
|
|
|
/* Are there any templates that are newly used? */
|
|
|
|
if (! repo_changed)
|
|
for (t = pending_repo; t; t = TREE_CHAIN (t))
|
|
{
|
|
if (IDENTIFIER_REPO_USED (TREE_VALUE (t)))
|
|
{
|
|
repo_changed = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
dir = getpwd ();
|
|
args = getenv ("COLLECT_GCC_OPTIONS");
|
|
|
|
if (! repo_changed && pending_repo)
|
|
if (strcmp (old_main, main_input_filename) != 0
|
|
|| strcmp (old_dir, dir) != 0
|
|
|| (args == NULL) != (old_args == NULL)
|
|
|| (args && strcmp (old_args, args) != 0))
|
|
repo_changed = 1;
|
|
|
|
if (! repo_changed || errorcount || sorrycount)
|
|
goto out;
|
|
|
|
reopen_repo_file_for_write ();
|
|
|
|
if (repo_file == 0)
|
|
goto out;
|
|
|
|
fprintf (repo_file, "M %s\n", main_input_filename);
|
|
fprintf (repo_file, "D %s\n", dir);
|
|
if (args)
|
|
fprintf (repo_file, "A %s\n", args);
|
|
|
|
for (t = pending_repo; t; t = TREE_CHAIN (t))
|
|
{
|
|
tree val = TREE_VALUE (t);
|
|
char type = IDENTIFIER_REPO_CHOSEN (val) ? 'C' : 'O';
|
|
|
|
fprintf (repo_file, "%c %s\n", type, IDENTIFIER_POINTER (val));
|
|
}
|
|
|
|
out:
|
|
if (repo_file)
|
|
fclose (repo_file);
|
|
}
|