fixup! fixup! arcv: apex: Add LTO support for APEX intrinsics.

Signed-off-by: Luis Silva <[email protected]>

Author: luismgsilva

gcc/config/riscv/riscv-apex-lto.cc

@@ -89,9 +89,9 @@ arcv_apex_lto_write_section (void)
   if (apex_count == 0)
     return;
 
-  /* First pass: count how many intrinsics are actually used and not
-     optimized away.  */
-  int used_count = 0;
+  /* Collect indices of intrinsics that are actually used and not optimized
+     away.  Use an auto_vec to avoid manual memory management.  */
+  auto_vec<int> used_indices;
   for (int i = 0; i < apex_count; i++)
   {
     const char *fn_name = arcv_apex_get_fn_name (i);
@@ -101,14 +101,14 @@ arcv_apex_lto_write_section (void)
     symtab_node *snode = symtab_node::get_for_asmname (
       get_identifier (fn_name));
 
-    /* Only count intrinsics that exist and are actually used.
+    /* Only keep intrinsics that exist and are actually used.
        Check if the symbol is referred to anywhere in the program.  */
     if (snode && snode->referred_to_p ())
-      used_count++;
+      used_indices.safe_push (i);
   }
 
   /* If all intrinsics were optimized away, skip section creation.  */
-  if (used_count == 0)
+  if (used_indices.is_empty ())
     return;
 
   /* Create a new LTO section for APEX intrinsics.  */
@@ -120,11 +120,12 @@ arcv_apex_lto_write_section (void)
 
   /* Write the number of used APEX builtins so the reader knows
      how many to expect.  */
-  streamer_write_uhwi_stream (ob->main_stream, used_count);
+  streamer_write_uhwi_stream (ob->main_stream, used_indices.length ());
 
-  /* Second pass: serialize only the intrinsics that are still used.  */
-  for (int i = 0; i < apex_count; i++)
+  /* Serialize only the intrinsics that are still used.  */
+  for (unsigned int idx = 0; idx < used_indices.length (); idx++)
   {
+    int i = used_indices[idx];
     const char *fn_name = NULL;
     const char *insn_name = NULL;
     unsigned int opcode = 0;
@@ -137,14 +138,6 @@ arcv_apex_lto_write_section (void)
     /* Function and instruction names must exist.  */
     gcc_assert (fn_name && insn_name);
 
-    /* Check if the intrinsic is still referenced in the program.  */
-    symtab_node *snode = symtab_node::get_for_asmname (
-      get_identifier (fn_name));
-
-    /* Skip intrinsics that were optimized away.  */
-    if (!snode || !snode->referred_to_p ())
-      continue;
-
     /* Write function name as length-prefixed string.  */
     size_t name_len = strlen (fn_name);
     streamer_write_uhwi_stream (ob->main_stream, name_len);