diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-04-10 06:53:57 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-04-10 06:53:57 +0000 |
| commit | 144af36dbeaa71da4c6ae776457aa9e769d37b22 (patch) | |
| tree | b726f0ebf7f8dbab38ace424055884259f6194ce /gcc/cp/typeck.c | |
| parent | 8c389f849ab65cfb5bc82fb2a3c4d815e193ecfd (diff) | |
| download | gcc-144af36dbeaa71da4c6ae776457aa9e769d37b22.zip gcc-144af36dbeaa71da4c6ae776457aa9e769d37b22.tar.gz gcc-144af36dbeaa71da4c6ae776457aa9e769d37b22.tar.bz2 | |
cp-tree.h (struct lang_decl): Remove main_decl_variant.
* cp-tree.h (struct lang_decl): Remove main_decl_variant.
(DECL_MAIN_VARIANT): Remove.
* decl.c (duplicate_decls): Don't set it.
(start_function): Likewise.
(lang_mark_tree): Don't mark it.
* decl2.c (defer_fn): Don't use it.
* lex.c (retrofit_lang_decl): Don't set it.
* pt.c (tsubst_decl): Likewise.
* ptree.c (print_lang_decl): Don't print it.
* typeck.c (mark_addressable): Don't use it.
From-SVN: r33048
Diffstat (limited to 'gcc/cp/typeck.c')
| -rw-r--r-- | gcc/cp/typeck.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 117f30f..65d75c0 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4988,15 +4988,13 @@ mark_addressable (exp) return 1; case FUNCTION_DECL: - if (DECL_LANG_SPECIFIC (x) != 0) - { - x = DECL_MAIN_VARIANT (x); - /* We have to test both conditions here. The first may be - non-zero in the case of processing a default function. The - second may be non-zero in the case of a template function. */ - if (DECL_TEMPLATE_INFO (x) && !DECL_TEMPLATE_SPECIALIZATION (x)) - mark_used (x); - } + /* We have to test both conditions here. The first may be + non-zero in the case of processing a default function. The + second may be non-zero in the case of a template function. */ + if (DECL_LANG_SPECIFIC (x) + && DECL_TEMPLATE_INFO (x) + && !DECL_TEMPLATE_SPECIALIZATION (x)) + mark_used (x); TREE_ADDRESSABLE (x) = 1; TREE_USED (x) = 1; TREE_ADDRESSABLE (DECL_ASSEMBLER_NAME (x)) = 1; |