Move inline_asm_index from CodegenCx to FunctionCx

Author: bjorn3

src/base.rs

@@ -104,6 +104,7 @@ pub(crate) fn codegen_fn<'tcx>(
 
         clif_comments,
         next_ssa_var: 0,
+        inline_asm_index: 0,
     };
 
     tcx.prof.generic_activity("codegen clif ir").run(|| codegen_fn_body(&mut fx, start_block));

src/common.rs

@@ -292,6 +292,8 @@ pub(crate) struct FunctionCx<'m, 'clif, 'tcx: 'm> {
 
     /// This should only be accessed by `CPlace::new_var`.
     pub(crate) next_ssa_var: u32,
+
+    pub(crate) inline_asm_index: u32,
 }
 
 impl<'tcx> LayoutOfHelpers<'tcx> for FunctionCx<'_, '_, 'tcx> {

src/inline_asm.rs

@@ -103,11 +103,12 @@ pub(crate) fn codegen_inline_asm_terminator<'tcx>(
                     // be exported from the main codegen unit and may thus be unreachable from the
                     // object file created by an external assembler.
                     let wrapper_name = format!(
-                        "__inline_asm_{}_wrapper_n{}",
+                        "{}__inline_asm_{}_wrapper_n{}",
+                        fx.symbol_name,
                         fx.cx.cgu_name.as_str().replace('.', "__").replace('-', "_"),
-                        fx.cx.inline_asm_index
+                        fx.inline_asm_index,
                     );
-                    fx.cx.inline_asm_index += 1;
+                    fx.inline_asm_index += 1;
                     let sig =
                         get_function_sig(fx.tcx, fx.target_config.default_call_conv, instance);
                     create_wrapper_function(fx.module, sig, &wrapper_name, symbol.name);
@@ -166,11 +167,12 @@ pub(crate) fn codegen_inline_asm_inner<'tcx>(
     asm_gen.allocate_stack_slots();
 
     let asm_name = format!(
-        "__inline_asm_{}_n{}",
+        "{}__inline_asm_{}_n{}",
+        fx.symbol_name,
         fx.cx.cgu_name.as_str().replace('.', "__").replace('-', "_"),
-        fx.cx.inline_asm_index
+        fx.inline_asm_index,
     );
-    fx.cx.inline_asm_index += 1;
+    fx.inline_asm_index += 1;
 
     let generated_asm = asm_gen.generate_asm_wrapper(&asm_name);
     fx.cx.global_asm.push_str(&generated_asm);

src/lib.rs

@@ -129,7 +129,6 @@ struct CodegenCx {
     invocation_temp: Option<String>,
     should_write_ir: bool,
     global_asm: String,
-    inline_asm_index: usize,
     debug_context: Option<DebugContext>,
     cgu_name: Symbol,
 }
@@ -148,7 +147,6 @@ impl CodegenCx {
             invocation_temp: tcx.sess.invocation_temp.clone(),
             should_write_ir: crate::pretty_clif::should_write_ir(tcx),
             global_asm: String::new(),
-            inline_asm_index: 0,
             debug_context,
             cgu_name,
         }