diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2003-03-07 07:02:02 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2003-03-07 07:02:02 +0000 |
| commit | 3d93842695fa7650032bed46338d3f1339cbb42c (patch) | |
| tree | 9fb76bbd4262b032899b2cd77f6653508a644d54 /gcc/cp/rtti.c | |
| parent | ea67bef4705c2012dfe5c35ff15cb0ebc78ea2da (diff) | |
| download | gcc-3d93842695fa7650032bed46338d3f1339cbb42c.zip gcc-3d93842695fa7650032bed46338d3f1339cbb42c.tar.gz gcc-3d93842695fa7650032bed46338d3f1339cbb42c.tar.bz2 | |
call.c (merge_conversion_sequences): New function.
* call.c (merge_conversion_sequences): New function.
(build_conv): Set ICS_USER_FLAG for USER_CONVs.
(convert_class_to_reference): Correct handling of second
standard conversion sequence in a user-defined conversion
sequence.
(build_user_type_conversion_1): Use merge_conversion_sequences.
* cp-tree.def: Add comments for CONV nodes.
* g++.dg/init/ref3.C: New test.
From-SVN: r63930
Diffstat (limited to 'gcc/cp/rtti.c')
| -rw-r--r-- | gcc/cp/rtti.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 9ebae8b..eab85f7 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -378,13 +378,8 @@ get_tinfo_decl (tree type) static tree get_tinfo_ptr (tree type) { - tree exp = get_tinfo_decl (type); - - /* Convert to type_info type. */ - exp = build_unary_op (ADDR_EXPR, exp, 0); - exp = ocp_convert (type_info_ptr_type, exp, CONV_REINTERPRET, 0); - - return exp; + return build_nop (type_info_ptr_type, + build_address (get_tinfo_decl (type))); } /* Return the type_info object for TYPE. */ |