re PR c++/37342 (same canonical type node for different types void…

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  <doug.gregor@gmail.com>

       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  <doug.gregor@gmail.com>

       PR c++/37342
       * g++.dg/other/canon-37342.C: New.

From-SVN: r140037

gcc/cp/ChangeLog

+2008-09-05  Douglas Gregor  <doug.gregor@gmail.com>
+
+       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  <iant@google.com>
 
 	* parser.c (check_no_duplicate_clause): Change code parameter to

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;
 }
 

gcc/testsuite/ChangeLog

+2008-09-05  Douglas Gregor  <doug.gregor@gmail.com>
+
+       PR c++/37342
+       * g++.dg/other/canon-37342.C: New.
+	
 2008-09-05  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.c-torture/compile/20080903-1.c: New test.

gcc/testsuite/g++.dg/other/canon-37342.C

+class Asm;
+template<typename _CharT> class basic_ostream;
+typedef basic_ostream<char> ostream;
+class Options {
+    typedef void (Asm::* emitfunc_t) (ostream &);
+    emitfunc_t getemit () const { return emitfunc; }
+    emitfunc_t emitfunc;
+};