diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e013cf0..8fa71ad 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-02-20 Mark Mitchell <mark@codesourcery.com> + + PR c++/9729 + * mangle.c (mangle_conv_op_name_for_type): Issue an error message + when the G++ 3.2 ABI prevents correct compilation. + 2003-02-20 Nathan Sidwell <nathan@codesourcery.com> Change base class access representation. Share virtual base diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index fae2237..06d8f96 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -1,5 +1,5 @@ /* Name mangling for the 3.0 C++ ABI. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Written by Alex Samuel <sameul@codesourcery.com> This file is part of GCC. @@ -2644,9 +2644,16 @@ mangle_conv_op_name_for_type (type) free (op_name); /* It had better be a unique mangling for the type. */ - my_friendly_assert (!IDENTIFIER_TYPENAME_P (identifier) - || same_type_p (type, TREE_TYPE (identifier)), - 20011230); + if (IDENTIFIER_TYPENAME_P (identifier) + && !same_type_p (type, TREE_TYPE (identifier))) + { + /* In G++ 3.2, the name mangling scheme was ambiguous. In later + versions of the ABI, this problem has been fixed. */ + if (abi_version_at_least (2)) + abort (); + error ("due to a defect in the G++ 3.2 ABI, G++ has assigned the " + "same mangled name to two different types"); + } /* Set bits on the identifier so we know later it's a conversion. */ IDENTIFIER_OPNAME_P (identifier) = 1; |