From 7aa4a1dfa98e1368ba4cb05b5bd19f9c96def4fb Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 5 Sep 2008 17:04:12 +0000 Subject: re PR c++/37342 (same canonical type node for different types void (Asm::*)(std::ostream&) and void (Asm::* const)(std::ostream&)) 2008-09-05 Douglas Gregor PR c++/37342 * tree.c (cp_build_qualified_type_real): Deal with sharing of TYPE_LANG_SPECIFIC in the canonical types of pointer-to-method types. 2008-09-05 Douglas Gregor PR c++/37342 * g++.dg/other/canon-37342.C: New. From-SVN: r140037 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/tree.c | 11 +++++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/canon-37342.C | 8 ++++++++ 4 files changed, 31 insertions(+) create mode 100644 gcc/testsuite/g++.dg/other/canon-37342.C (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 09091cc..cb5c314 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2008-09-05 Douglas Gregor + + PR c++/37342 + * tree.c (cp_build_qualified_type_real): Deal with sharing of + TYPE_LANG_SPECIFIC in the canonical types of pointer-to-method + types. + 2008-09-04 Ian Lance Taylor * parser.c (check_no_duplicate_clause): Change code parameter to diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index f9df932..9126763 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -877,6 +877,17 @@ cp_build_qualified_type_real (tree type, && TYPE_LANG_SPECIFIC (result) == TYPE_LANG_SPECIFIC (type)) TYPE_LANG_SPECIFIC (result) = NULL; + /* We may also have ended up building a new copy of the canonical + type of a pointer-to-method type, which could have the same + sharing problem described above. */ + if (TYPE_CANONICAL (result) != TYPE_CANONICAL (type) + && TREE_CODE (type) == POINTER_TYPE + && TREE_CODE (TREE_TYPE (type)) == METHOD_TYPE + && (TYPE_LANG_SPECIFIC (TYPE_CANONICAL (result)) + == TYPE_LANG_SPECIFIC (TYPE_CANONICAL (type)))) + TYPE_LANG_SPECIFIC (TYPE_CANONICAL (result)) = NULL; + + return result; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3278ced..eb9da58 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-05 Douglas Gregor + + PR c++/37342 + * g++.dg/other/canon-37342.C: New. + 2008-09-05 Joseph Myers * gcc.c-torture/compile/20080903-1.c: New test. diff --git a/gcc/testsuite/g++.dg/other/canon-37342.C b/gcc/testsuite/g++.dg/other/canon-37342.C new file mode 100644 index 0000000..dd96e40 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/canon-37342.C @@ -0,0 +1,8 @@ +class Asm; +template class basic_ostream; +typedef basic_ostream ostream; +class Options { + typedef void (Asm::* emitfunc_t) (ostream &); + emitfunc_t getemit () const { return emitfunc; } + emitfunc_t emitfunc; +}; -- cgit v1.1