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

* decl2.c, pt.c: Revert c++/7754 fix. 

From-SVN: r57895
This commit is contained in:
Richard Henderson 2002-10-07 02:49:18 -07:00 committed by Richard Henderson
parent e0fbf84951
commit 01f4137fea
3 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2002-10-07 Richard Henderson <rth@redhat.com>
* decl2.c, pt.c: Revert c++/7754 fix.
2002-10-05 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> 2002-10-05 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/7804 PR c++/7804

39
gcc/cp/decl2.c
View File

@ -1382,31 +1382,26 @@ finish_anon_union (anon_union_decl)
return; return;
} }
if (!processing_template_decl) main_decl = build_anon_union_vars (anon_union_decl,
{ &DECL_ANON_UNION_ELEMS (anon_union_decl),
main_decl static_p, external_p);
= build_anon_union_vars (anon_union_decl,
&DECL_ANON_UNION_ELEMS (anon_union_decl),
static_p, external_p);
if (main_decl == NULL_TREE)
{
warning ("anonymous aggregate with no members");
return;
}
if (static_p) if (main_decl == NULL_TREE)
{ {
make_decl_rtl (main_decl, 0); warning ("anonymous aggregate with no members");
COPY_DECL_RTL (main_decl, anon_union_decl); return;
expand_anon_union_decl (anon_union_decl,
NULL_TREE,
DECL_ANON_UNION_ELEMS (anon_union_decl));
return;
}
} }
add_decl_stmt (anon_union_decl); if (static_p)
{
make_decl_rtl (main_decl, 0);
COPY_DECL_RTL (main_decl, anon_union_decl);
expand_anon_union_decl (anon_union_decl,
NULL_TREE,
DECL_ANON_UNION_ELEMS (anon_union_decl));
}
else
add_decl_stmt (anon_union_decl);
} }
/* Finish processing a builtin type TYPE. It's name is NAME, /* Finish processing a builtin type TYPE. It's name is NAME,

36
gcc/cp/pt.c
View File

@ -6134,7 +6134,7 @@ tsubst_decl (t, args, type, complain)
} }
r = copy_decl (t); r = copy_decl (t);
TREE_TYPE (r) = complete_type (type); TREE_TYPE (r) = type;
c_apply_type_quals_to_decl (cp_type_quals (type), r); c_apply_type_quals_to_decl (cp_type_quals (type), r);
DECL_CONTEXT (r) = ctx; DECL_CONTEXT (r) = ctx;
/* Clear out the mangled name and RTL for the instantiation. */ /* Clear out the mangled name and RTL for the instantiation. */
@ -6173,8 +6173,6 @@ tsubst_decl (t, args, type, complain)
TREE_CHAIN (r) = NULL_TREE; TREE_CHAIN (r) = NULL_TREE;
if (TREE_CODE (r) == VAR_DECL && VOID_TYPE_P (type)) if (TREE_CODE (r) == VAR_DECL && VOID_TYPE_P (type))
cp_error_at ("instantiation of `%D' as type `%T'", r, type); cp_error_at ("instantiation of `%D' as type `%T'", r, type);
/* Compute the size, alignment, etc. of R. */
layout_decl (r, 0);
} }
break; break;
@ -7426,6 +7424,9 @@ tsubst_expr (t, args, complain, in_decl)
decl = tsubst (decl, args, complain, in_decl); decl = tsubst (decl, args, complain, in_decl);
if (decl != error_mark_node) if (decl != error_mark_node)
{ {
if (TREE_CODE (decl) != TYPE_DECL)
/* Make sure the type is instantiated now. */
complete_type (TREE_TYPE (decl));
if (init) if (init)
DECL_INITIAL (decl) = error_mark_node; DECL_INITIAL (decl) = error_mark_node;
/* By marking the declaration as instantiated, we avoid /* By marking the declaration as instantiated, we avoid
@ -7435,26 +7436,19 @@ tsubst_expr (t, args, complain, in_decl)
do. */ do. */
if (TREE_CODE (decl) == VAR_DECL) if (TREE_CODE (decl) == VAR_DECL)
DECL_TEMPLATE_INSTANTIATED (decl) = 1; DECL_TEMPLATE_INSTANTIATED (decl) = 1;
if (TREE_CODE (decl) == VAR_DECL maybe_push_decl (decl);
&& ANON_AGGR_TYPE_P (TREE_TYPE (decl))) if (DECL_PRETTY_FUNCTION_P (decl))
/* Anonymous aggregates are a special case. */
finish_anon_union (decl);
else
{ {
maybe_push_decl (decl); /* For __PRETTY_FUNCTION__ we have to adjust the
if (DECL_PRETTY_FUNCTION_P (decl)) initializer. */
{ const char *const name
/* For __PRETTY_FUNCTION__ we have to adjust the = cxx_printable_name (current_function_decl, 2);
initializer. */ init = cp_fname_init (name);
const char *const name TREE_TYPE (decl) = TREE_TYPE (init);
= cxx_printable_name (current_function_decl, 2);
init = cp_fname_init (name);
TREE_TYPE (decl) = TREE_TYPE (init);
}
else
init = tsubst_expr (init, args, complain, in_decl);
cp_finish_decl (decl, init, NULL_TREE, 0);
} }
else
init = tsubst_expr (init, args, complain, in_decl);
cp_finish_decl (decl, init, NULL_TREE, 0);
} }
} }