lto: Compute partition boundary with asm_nodes

Previous patch added asm_node streaming, so we need to add referenced
symbols to partition.

asm_nodes must be added to partition before computing the boundary.

gcc/ChangeLog:

	* lto-cgraph.cc (compute_ltrans_boundary): Add symbols
	referenced from asm_nodes.
	* lto-streamer-out.cc (lto_output): Move adding asm_nodes
	to...
	* passes.cc (ipa_write_summaries): ...here.

gcc/testsuite/ChangeLog:

	* gcc.dg/lto/toplevel-extended-asm-1_0.c: New test.
	* gcc.dg/lto/toplevel-extended-asm-1_1.c: New test.

diff --git a/gcc/lto-cgraph.cc b/gcc/lto-cgraph.cc
index cbb37875b89e09bbafc884d45caad67c8730431b..71fbf80c54b239a9410c6477c884741ab8df4b6f 100644 (file)
--- a/gcc/lto-cgraph.cc
+++ b/gcc/lto-cgraph.cc
@@ -899,6 +899,24 @@ compute_ltrans_boundary (lto_symtab_encoder_t in_encoder)
       lto_set_symtab_encoder_encode_initializer (encoder, vnode);
       create_references (encoder, vnode);
     }
+  for (lsei = lsei_start (in_encoder); !lsei_end_p (lsei); lsei_next (&lsei))
+    {
+      toplevel_node *tnode = lsei_node (lsei);
+      if (asm_node* node = dyn_cast <asm_node*> (tnode))
+       {
+         symtab_node* ref;
+         for (unsigned i = 0; node->symbols_referenced.iterate (i, &ref); i++)
+           {
+             if (!lto_symtab_encoder_in_partition_p (encoder, ref))
+               {
+                 if (cgraph_node* cref = dyn_cast <cgraph_node*> (ref))
+                   add_node_to (encoder, cref, false);
+                 else if (varpool_node *vref = dyn_cast <varpool_node *> (ref))
+                   lto_symtab_encoder_encode (encoder, vref);
+               }
+           }
+       }
+    }
   /* Pickle in also the initializer of all referenced readonly variables
      to help folding.  Constant pool variables are not shared, so we must
      pickle those too.  */

diff --git a/gcc/lto-streamer-out.cc b/gcc/lto-streamer-out.cc
index 293871cd7edc24bdbf2ccfcdf8ddd256d44570b4..5338a952cb0b5a033efe8c3361ad120ae4bda83f 100644 (file)
--- a/gcc/lto-streamer-out.cc
+++ b/gcc/lto-streamer-out.cc
@@ -2817,15 +2817,6 @@ lto_output (void)
   lto_symtab_encoder_t encoder = lto_get_out_decl_state ()->symtab_node_encoder;
   auto_vec<symtab_node *> symbols_to_copy;
 
-  if (!flag_wpa)
-    {
-      asm_node *anode;
-      for (anode = symtab->first_asm_symbol ();
-          anode;
-          anode = safe_as_a<asm_node*>(anode->next))
-       lto_set_symtab_encoder_in_partition (encoder, anode);
-    }
-
   create_order_remap (encoder);
 
   prune_offload_funcs ();

diff --git a/gcc/passes.cc b/gcc/passes.cc
index 837f84e3d834f40131c287196dd7e3dc124cac0b..a7e8d4a8f18da23fa2a946383c805233b2d93453 100644 (file)
--- a/gcc/passes.cc
+++ b/gcc/passes.cc
@@ -2911,6 +2911,11 @@ ipa_write_summaries (void)
     if (vnode->need_lto_streaming)
       lto_set_symtab_encoder_in_partition (encoder, vnode);
 
+  asm_node *anode;
+  for (anode = symtab->first_asm_symbol (); anode;
+       anode = safe_as_a<asm_node*> (anode->next))
+    lto_set_symtab_encoder_in_partition (encoder, anode);
+
   ipa_write_summaries_1 (compute_ltrans_boundary (encoder),
                         flag_generate_offload);
 

diff --git a/gcc/testsuite/gcc.dg/lto/toplevel-extended-asm-1_0.c b/gcc/testsuite/gcc.dg/lto/toplevel-extended-asm-1_0.c
new file mode 100644 (file)
index 0000000..341d95a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/toplevel-extended-asm-1_0.c
@@ -0,0 +1,19 @@
+/* { dg-lto-do link } */
+/* { dg-lto-options {{-O2 -flto -flto-partition=1to1} } } */
+
+void asm_fn();
+void asm_fn_used();
+
+asm(".global %cc0\n%cc0:" :: ":" (asm_fn));
+asm(".global %cc0\n%cc0:" :: ":" (asm_fn_used));
+
+
+__attribute__((noinline))
+int privatized_fn(int v) { return v + v;}
+
+extern void call_privatized_fn();
+
+int main() {
+  privatized_fn (0);
+  call_privatized_fn ();
+}

diff --git a/gcc/testsuite/gcc.dg/lto/toplevel-extended-asm-1_1.c b/gcc/testsuite/gcc.dg/lto/toplevel-extended-asm-1_1.c
new file mode 100644 (file)
index 0000000..0c665ff
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/toplevel-extended-asm-1_1.c
@@ -0,0 +1,12 @@
+extern void asm_fn_used();
+
+__attribute__((used))
+void local_caller() {
+  asm_fn_used();
+}
+
+__attribute__((noipa))
+static void privatized_fn() { asm volatile ("");}
+asm(".long %cc0" :: "s"(privatized_fn));
+
+void call_privatized_fn() { privatized_fn();}