Auto merge of #146973 - Zalathar:args-memo, r=<try>

Compute quoted args for debuginfo at most once per session

Author: rust-bors[bot]

compiler/rustc_codegen_llvm/src/back/command_line_args.rs

@@ -1,5 +1,4 @@
 pub(crate) mod archive;
-mod command_line_args;
 pub(crate) mod lto;
 pub(crate) mod owned_target_machine;
 mod profiling;

compiler/rustc_codegen_llvm/src/back/mod.rs

@@ -22,6 +22,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_errors::{DiagCtxtHandle, Level};
 use rustc_fs_util::{link_or_copy, path_to_c_string};
+use rustc_middle::middle::debuginfo::CommandLineArgsForDebuginfo;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_session::config::{
@@ -31,7 +32,6 @@ use rustc_span::{BytePos, InnerSpan, Pos, SpanData, SyntaxContext, sym};
 use rustc_target::spec::{CodeModel, FloatAbi, RelocModel, SanitizerSet, SplitDebuginfo, TlsModel};
 use tracing::{debug, trace};
 
-use crate::back::command_line_args::quote_command_line_args;
 use crate::back::lto::ThinBuffer;
 use crate::back::owned_target_machine::OwnedTargetMachine;
 use crate::back::profiling::{
@@ -108,7 +108,11 @@ pub(crate) fn create_informational_target_machine(
     sess: &Session,
     only_base_features: bool,
 ) -> OwnedTargetMachine {
-    let config = TargetMachineFactoryConfig { split_dwarf_file: None, output_obj_file: None };
+    let config = TargetMachineFactoryConfig {
+        split_dwarf_file: None,
+        output_obj_file: None,
+        args_for_debuginfo: None,
+    };
     // Can't use query system here quite yet because this function is invoked before the query
     // system/tcx is set up.
     let features = llvm_util::global_llvm_features(sess, false, only_base_features);
@@ -133,7 +137,12 @@ pub(crate) fn create_target_machine(tcx: TyCtxt<'_>, mod_name: &str) -> OwnedTar
         mod_name,
         tcx.sess.invocation_temp.as_deref(),
     ));
-    let config = TargetMachineFactoryConfig { split_dwarf_file, output_obj_file };
+
+    let config = TargetMachineFactoryConfig {
+        split_dwarf_file,
+        output_obj_file,
+        args_for_debuginfo: Some(Arc::clone(tcx.args_for_debuginfo())),
+    };
 
     target_machine_factory(
         tcx.sess,
@@ -253,19 +262,6 @@ pub(crate) fn target_machine_factory(
 
     let use_emulated_tls = matches!(sess.tls_model(), TlsModel::Emulated);
 
-    // Command-line information to be included in the target machine.
-    // This seems to only be used for embedding in PDB debuginfo files.
-    // FIXME(Zalathar): Maybe skip this for non-PDB targets?
-    let argv0 = std::env::current_exe()
-        .unwrap_or_default()
-        .into_os_string()
-        .into_string()
-        .unwrap_or_default();
-    let command_line_args = quote_command_line_args(&sess.expanded_args);
-    // Self-profile counter for the number of bytes produced by command-line quoting.
-    // Values are summed, so the summary result is cumulative across all TM factories.
-    sess.prof.artifact_size("quoted_command_line_args", "-", command_line_args.len() as u64);
-
     let debuginfo_compression = sess.opts.debuginfo_compression.to_string();
     match sess.opts.debuginfo_compression {
         rustc_session::config::DebugInfoCompression::Zlib => {
@@ -304,6 +300,14 @@ pub(crate) fn target_machine_factory(
         let split_dwarf_file = path_to_cstring_helper(config.split_dwarf_file);
         let output_obj_file = path_to_cstring_helper(config.output_obj_file);
 
+        let (argv0, quoted_args) = config
+            .args_for_debuginfo
+            .as_deref()
+            .map(|CommandLineArgsForDebuginfo { argv0, quoted_args }| {
+                (argv0.as_str(), quoted_args.as_str())
+            })
+            .unwrap_or_default();
+
         OwnedTargetMachine::new(
             &triple,
             &cpu,
@@ -326,8 +330,8 @@ pub(crate) fn target_machine_factory(
             &output_obj_file,
             &debuginfo_compression,
             use_emulated_tls,
-            &argv0,
-            &command_line_args,
+            argv0,
+            quoted_args,
             use_wasm_eh,
         )
     })

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -25,6 +25,7 @@ use rustc_incremental::{
 use rustc_metadata::fs::copy_to_stdout;
 use rustc_middle::bug;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
+use rustc_middle::middle::debuginfo::CommandLineArgsForDebuginfo;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_session::config::{
@@ -283,6 +284,10 @@ pub struct TargetMachineFactoryConfig {
     /// The name of the output object file. Used for setting OutputFilenames in target options
     /// so that LLVM can emit the CodeView S_OBJNAME record in pdb files
     pub output_obj_file: Option<PathBuf>,
+
+    /// Contains a copy of [`TyCtxt::args_for_debuginfo`] for codegen,
+    /// or `None` if the target machine is informational only.
+    pub args_for_debuginfo: Option<Arc<CommandLineArgsForDebuginfo>>,
 }
 
 impl TargetMachineFactoryConfig {
@@ -306,7 +311,12 @@ impl TargetMachineFactoryConfig {
             module_name,
             cgcx.invocation_temp.as_deref(),
         ));
-        TargetMachineFactoryConfig { split_dwarf_file, output_obj_file }
+
+        TargetMachineFactoryConfig {
+            split_dwarf_file,
+            output_obj_file,
+            args_for_debuginfo: Some(Arc::clone(&cgcx.args_for_debuginfo)),
+        }
     }
 }
 
@@ -350,7 +360,7 @@ pub struct CodegenContext<B: WriteBackendMethods> {
     /// This will only be used within debug info, e.g. in the pdb file on windows
     /// This is mainly useful for other tools that reads that debuginfo to figure out
     /// how to call the compiler with the same arguments.
-    pub expanded_args: Vec<String>,
+    pub args_for_debuginfo: Arc<CommandLineArgsForDebuginfo>,
 
     /// Emitter to use for diagnostics produced during codegen.
     pub diag_emitter: SharedEmitter,
@@ -1153,7 +1163,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
         remark: sess.opts.cg.remark.clone(),
         remark_dir,
         incr_comp_session_dir: sess.incr_comp_session_dir_opt().map(|r| r.clone()),
-        expanded_args: tcx.sess.expanded_args.clone(),
+        args_for_debuginfo: Arc::clone(tcx.args_for_debuginfo()),
         diag_emitter: shared_emitter.clone(),
         output_filenames: Arc::clone(tcx.output_filenames(())),
         module_config: regular_config,

compiler/rustc_codegen_ssa/src/back/write.rs

@@ -0,0 +1,67 @@
+use std::sync::Arc;
+
+use rustc_middle::middle::debuginfo::CommandLineArgsForDebuginfo;
+use rustc_middle::ty::TyCtxt;
+use rustc_middle::util::Providers;
+
+#[cfg(test)]
+mod tests;
+
+pub(crate) fn provide(providers: &mut Providers) {
+    providers.hooks.args_for_debuginfo = args_for_debuginfo;
+}
+
+/// Hook implementation for [`TyCtxt::args_for_debuginfo`].
+fn args_for_debuginfo<'tcx>(tcx: TyCtxt<'tcx>) -> &'tcx Arc<CommandLineArgsForDebuginfo> {
+    tcx.args_for_debuginfo_cache.get_or_init(|| {
+        // Command-line information to be included in the target machine.
+        // This seems to only be used for embedding in PDB debuginfo files.
+        // FIXME(Zalathar): Maybe skip this for non-PDB targets?
+        let argv0 = std::env::current_exe()
+            .unwrap_or_default()
+            .into_os_string()
+            .into_string()
+            .unwrap_or_default();
+        let quoted_args = quote_command_line_args(&tcx.sess.expanded_args);
+
+        // Self-profile counter for the number of bytes produced by command-line quoting.
+        tcx.prof.artifact_size("quoted_command_line_args", "-", quoted_args.len() as u64);
+
+        Arc::new(CommandLineArgsForDebuginfo { argv0, quoted_args })
+    })
+}
+
+/// Joins command-line arguments into a single space-separated string, quoting
+/// and escaping individual arguments as necessary.
+///
+/// The result is intended to be informational, for embedding in debug metadata,
+/// and might not be properly quoted/escaped for actual command-line use.
+fn quote_command_line_args(args: &[String]) -> String {
+    // Start with a decent-sized buffer, since rustc invocations tend to be long.
+    let mut buf = String::with_capacity(128);
+
+    for arg in args {
+        if !buf.is_empty() {
+            buf.push(' ');
+        }
+
+        print_arg_quoted(&mut buf, arg);
+    }
+
+    buf
+}
+
+/// Equivalent to LLVM's `sys::printArg` with quoting always enabled
+/// (see llvm/lib/Support/Program.cpp).
+fn print_arg_quoted(buf: &mut String, arg: &str) {
+    buf.reserve(arg.len() + 2);
+
+    buf.push('"');
+    for ch in arg.chars() {
+        if matches!(ch, '"' | '\\' | '$') {
+            buf.push('\\');
+        }
+        buf.push(ch);
+    }
+    buf.push('"');
+}

compiler/rustc_codegen_ssa/src/debuginfo/command_line_args/mod.rs

@@ -3,7 +3,7 @@ use rustc_middle::bug;
 use rustc_middle::ty::layout::{IntegerExt, PrimitiveExt, TyAndLayout};
 use rustc_middle::ty::{self, Ty, TyCtxt};
 
-// FIXME(eddyb) find a place for this (or a way to replace it).
+pub(crate) mod command_line_args;
 pub mod type_names;
 
 /// Returns true if we want to generate a DW_TAG_enumeration_type description for

compiler/rustc_codegen_llvm/src/back/command_line_args/tests.rs renamed to compiler/rustc_codegen_ssa/src/debuginfo/command_line_args/tests.rs

@@ -1,5 +1,7 @@
 //! Type Names for Debug Info.
 
+// FIXME(eddyb) find a place for this (or a way to replace it).
+
 // Notes on targeting MSVC:
 // In general, MSVC's debugger attempts to parse all arguments as C++ expressions,
 // even if the argument is explicitly a symbol name.

compiler/rustc_codegen_ssa/src/debuginfo/mod.rs

@@ -271,6 +271,7 @@ pub enum CodegenErrors {
 pub fn provide(providers: &mut Providers) {
     crate::back::symbol_export::provide(providers);
     crate::base::provide(providers);
+    crate::debuginfo::command_line_args::provide(providers);
     crate::target_features::provide(providers);
     crate::codegen_attrs::provide(providers);
     providers.queries.global_backend_features = |_tcx: TyCtxt<'_>, ()| vec![];

compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

@@ -3,11 +3,14 @@
 //! similar to queries, but queries come with a lot of machinery for caching and incremental
 //! compilation, whereas hooks are just plain function pointers without any of the query magic.
 
+use std::sync::Arc;
+
 use rustc_hir::def_id::{DefId, DefPathHash};
 use rustc_session::StableCrateId;
 use rustc_span::def_id::{CrateNum, LocalDefId};
 use rustc_span::{ExpnHash, ExpnId};
 
+use crate::middle::debuginfo::CommandLineArgsForDebuginfo;
 use crate::mir;
 use crate::ty::{Ty, TyCtxt};
 
@@ -102,6 +105,13 @@ declare_hooks! {
     /// Ensure the given scalar is valid for the given type.
     /// This checks non-recursive runtime validity.
     hook validate_scalar_in_layout(scalar: crate::ty::ScalarInt, ty: Ty<'tcx>) -> bool;
+
+    /// Builds a quoted form of _all_ command-line args, for inclusion in some
+    /// forms of debuginfo (specifically PDB).
+    ///
+    /// This needs to _not_ be a query, because it would ruin incremental
+    /// compilation for CGUs that would otherwise be considered up-to-date.
+    hook args_for_debuginfo() -> &'tcx Arc<CommandLineArgsForDebuginfo>;
 }
 
 #[cold]