re PR c++/61623 (ICE: verify_symtab failed: Two symbols with same comdat_group…

re PR c++/61623 (ICE: verify_symtab failed: Two symbols with same comdat_group are not linked by the same_comdat_group list.)

	PR c++/61623
	* symtab.c (symtab_remove_from_same_comdat_group): Also
	set_comdat_group to NULL_TREE.
	(verify_symtab): Fix diagnostic.

From-SVN: r212705

gcc/ChangeLog

+2014-07-17  Jason Merrill  <jason@redhat.com>
+
+	PR c++/61623
+	* symtab.c (symtab_remove_from_same_comdat_group): Also
+	set_comdat_group to NULL_TREE.
+	(verify_symtab): Fix diagnostic.
+
 2014-07-16  David Wohlferd <dw@LimeGreenSocks.com>
 
 	PR target/61662

gcc/symtab.c

@@ -314,6 +314,7 @@ symtab_remove_from_same_comdat_group (symtab_node *node)
       else
 	prev->same_comdat_group = node->same_comdat_group;
       node->same_comdat_group = NULL;
+      node->set_comdat_group (NULL_TREE);
     }
 }
 
@@ -1217,7 +1218,7 @@ verify_symtab (void)
 		{
 		  error ("Two symbols with same comdat_group are not linked by the same_comdat_group list.");
 		  dump_symtab_node (stderr, *entry);
-		  dump_symtab_node (stderr, s);
+		  dump_symtab_node (stderr, node);
 		  internal_error ("verify_symtab failed");
 		}
 	}

gcc/testsuite/g++.dg/opt/declone2.C

+// PR c++/61623
+// { dg-options "-Os" }
+
+struct C {};
+struct B : virtual C {};
+struct A : B {
+  A (int) {}
+};
+
+A a (0);