[gcc(refs/users/aoliva/heads/testme)] strub: preserve comdat group

[Alexandre Oliva <aoliva@gcc.gnu.org>]

https://gcc.gnu.org/g:8b051050bb83c77b39a8d0b4c5ab07541a4dd0cc

commit 8b051050bb83c77b39a8d0b4c5ab07541a4dd0cc
Author: Alexandre Oliva <oliva@gnu.org>
Date:   Thu Jun 8 07:57:10 2023 -0300

    strub: preserve comdat group

Diff:
---
 gcc/cgraph.h      | 2 +-
 gcc/cgraphunit.cc | 5 +++--
 gcc/ipa-strub.cc  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index cedaaac3a45..177bd9dc5b7 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -153,7 +153,7 @@ public:
   void remove (void);
 
   /* Undo any definition or use of the symbol.  */
-  void reset (void);
+  void reset (bool preserve_comdat_group = false);
 
   /* Dump symtab node to F.  */
   void dump (FILE *f);
diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc
index bccd2f2abb5..9a550a5cce6 100644
--- a/gcc/cgraphunit.cc
+++ b/gcc/cgraphunit.cc
@@ -384,7 +384,7 @@ symbol_table::process_new_functions (void)
    functions or variables.  */
 
 void
-symtab_node::reset (void)
+symtab_node::reset (bool preserve_comdat_group)
 {
   /* Reset our data structures so we can analyze the function again.  */
   analyzed = false;
@@ -395,7 +395,8 @@ symtab_node::reset (void)
   cpp_implicit_alias = false;
 
   remove_all_references ();
-  remove_from_same_comdat_group ();
+  if (!preserve_comdat_group)
+    remove_from_same_comdat_group ();
 
   if (cgraph_node *cn = dyn_cast <cgraph_node *> (this))
     {
diff --git a/gcc/ipa-strub.cc b/gcc/ipa-strub.cc
index 921e4eb05ac..73a8771315c 100644
--- a/gcc/ipa-strub.cc
+++ b/gcc/ipa-strub.cc
@@ -2902,7 +2902,7 @@ pass_ipa_strub::execute (function *)
 	/* Remove the function's body but keep arguments to be reused
 	   for thunk.  */
 	onode->release_body (true);
-	onode->reset ();
+	onode->reset (/* unlike create_wrapper: preserve_comdat_group = */true);
 
 	DECL_UNINLINABLE (decl) = false;
 	DECL_RESULT (decl) = decl_result;