diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2003-10-24 07:59:41 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-10-24 07:59:41 +0000 |
| commit | bb88593883c783c600c89b8d1e5d7973c90d3f5a (patch) | |
| tree | 30f00d7a2377783a5112afcd6c22c5508f1c6309 /gcc/cp/pt.c | |
| parent | 0f3340356d5a1b7847301b0d20161b242cfc5dbd (diff) | |
| download | gcc-bb88593883c783c600c89b8d1e5d7973c90d3f5a.zip gcc-bb88593883c783c600c89b8d1e5d7973c90d3f5a.tar.gz gcc-bb88593883c783c600c89b8d1e5d7973c90d3f5a.tar.bz2 | |
PR c++/12698, c++/12699, c++/12700, c++/12566
cp:
PR c++/12698, c++/12699, c++/12700, c++/12566
* cp-tree.h (THUNK_ALIAS_P, THUNK_ALIAS): New.
(debug_class, debug_thunks): New.
* class.c (dump_class_hierarchy_1): New break out from ...
(dump_class_hierarchy): ... here.
(dump_thunk, debug_thunks, debug_class): New.
(update_vtable_entry_for_fn): Add ssizetype casts. Correct
continued search for primary binfo via virtual.
(build_vtbl_initializer): Follow covariant thunk alias.
* method.c (make_thunk): Clear DECL_THUNKS of the thunk.
(finish_thunk): Look for an alias of the covariant thunk and point
to it.
(use_thunk): We should never use an alias.
* semantics.c (emit_associated_thunks): Do not emit aliases.
PR c++/12566
* cp-tree.h (cp_fname_init): Add TYPE pointer param.
* decl.c (cp_fname_init): Add TYPE pointer param. Set it. Don't
create an ad-hoc ERROR_MARK.
(cp_make_fname_decl): Adjust.
* pt.c (tsubst_expr): Adjust.
testsuite:
PR c++/12698, c++/12699, c++/12700, c++/12566
* g++.dg/inherit/covariant9.C: New test.
* g++.dg/inherit/covariant10.C: New test.
* g++.dg/inherit/covariant11.C: New test.
From-SVN: r72882
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0b2be7a..600d240 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7627,8 +7627,7 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) initializer. */ const char *const name = cxx_printable_name (current_function_decl, 2); - init = cp_fname_init (name); - TREE_TYPE (decl) = TREE_TYPE (init); + init = cp_fname_init (name, &TREE_TYPE (decl)); } else init = tsubst_expr (init, args, complain, in_decl); |