adapt to llvm debuginfo changes

Author: nebulark

compiler/rustc_codegen_llvm/src/back/owned_target_machine.rs

@@ -40,6 +40,8 @@ impl OwnedTargetMachine {
         debug_info_compression: &CStr,
         use_emulated_tls: bool,
         args_cstr_buff: &[u8],
+        compiler_path: &CStr,
+        commandline_args: &CStr,
     ) -> Result<Self, LlvmError<'static>> {
         assert!(args_cstr_buff.len() > 0);
         assert!(
@@ -73,6 +75,8 @@ impl OwnedTargetMachine {
                 use_emulated_tls,
                 args_cstr_buff.as_ptr() as *const c_char,
                 args_cstr_buff.len(),
+                compiler_path.as_ptr(),
+                commandline_args.as_ptr(),
             )
         };
 

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -167,6 +167,29 @@ fn to_llvm_relocation_model(relocation_model: RelocModel) -> llvm::RelocModel {
     }
 }
 
+fn flatten_commandline_args(args: &[String]) -> CString {
+    let mut result: String = Default::default();
+
+    let mut did_print_arg = false;
+
+    for arg in args {
+        if arg.ends_with(".rs") {
+            continue;
+        }
+
+        if did_print_arg {
+            result.push(' ');
+        }
+
+        result.push('"');
+        result.push_str(arg);
+        result.push('"');
+        did_print_arg = true;
+    }
+
+    CString::new(result).unwrap()
+}
+
 pub(crate) fn to_llvm_code_model(code_model: Option<CodeModel>) -> llvm::CodeModel {
     match code_model {
         Some(CodeModel::Tiny) => llvm::CodeModel::Tiny,
@@ -247,6 +270,16 @@ pub(crate) fn target_machine_factory(
         args_cstr_buff
     };
 
+    let commandline_args = flatten_commandline_args(&sess.expanded_args);
+    let compiler_path = CString::new(
+        std::env::current_exe()
+            .unwrap_or_default()
+            .into_os_string()
+            .into_string()
+            .unwrap_or_default(),
+    )
+    .unwrap();
+
     let debuginfo_compression = sess.opts.debuginfo_compression.to_string();
     match sess.opts.debuginfo_compression {
         rustc_session::config::DebugInfoCompression::Zlib => {
@@ -302,6 +335,8 @@ pub(crate) fn target_machine_factory(
             &debuginfo_compression,
             use_emulated_tls,
             &args_cstr_buff,
+            &compiler_path,
+            &commandline_args,
         )
     })
 }

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -2176,6 +2176,8 @@ unsafe extern "C" {
         UseEmulatedTls: bool,
         ArgsCstrBuff: *const c_char,
         ArgsCstrBuffLen: usize,
+        CompilerPath: *const c_char,
+        CommandlineArgs: *const c_char,
     ) -> *mut TargetMachine;
 
     pub fn LLVMRustDisposeTargetMachine(T: *mut TargetMachine);

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

@@ -398,7 +398,8 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
     bool EmitStackSizeSection, bool RelaxELFRelocations, bool UseInitArray,
     const char *SplitDwarfFile, const char *OutputObjFile,
     const char *DebugInfoCompression, bool UseEmulatedTls,
-    const char *ArgsCstrBuff, size_t ArgsCstrBuffLen) {
+    const char *ArgsCstrBuff, size_t ArgsCstrBuffLen,
+    const char *CompilerPath, const char *CommandlineArgs) {
 
   auto OptLevel = fromRust(RustOptLevel);
   auto RM = fromRust(RustReloc);
@@ -484,23 +485,8 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
 
   Options.EmitStackSizeSection = EmitStackSizeSection;
 
+#if LLVM_VERSION_LT(20, 0)
   if (ArgsCstrBuff != nullptr) {
-#if LLVM_VERSION_GE(20, 0)
-    int buffer_offset = 0;
-    assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0');
-    auto Arg0 = std::string(ArgsCstrBuff);
-    buffer_offset = Arg0.size() + 1;
-    auto ArgsCppStr = std::string(ArgsCstrBuff + buffer_offset,
-                                  ArgsCstrBuffLen - buffer_offset);
-    auto i = 0;
-    while (i != std::string::npos) {
-      i = ArgsCppStr.find('\0', i + 1);
-      if (i != std::string::npos)
-        ArgsCppStr.replace(i, 1, " ");
-    }
-    Options.MCOptions.Argv0 = Arg0;
-    Options.MCOptions.CommandlineArgs = ArgsCppStr;
-#else
     int buffer_offset = 0;
     assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0');
 
@@ -525,9 +511,13 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
 
     Options.MCOptions.Argv0 = arg0;
     Options.MCOptions.CommandLineArgs =
-        llvm::ArrayRef<std::string>(cmd_arg_strings, num_cmd_arg_strings);
-#endif
+      llvm::ArrayRef<std::string>(cmd_arg_strings, num_cmd_arg_strings);
   }
+#else // LLVM_VERSION_GE(20, 0)
+  Options.MCOptions.CommandlineArgs = CommandlineArgs != nullptr ? CommandlineArgs : "";
+  Options.MCOptions.Argv0 = CompilerPath != nullptr ? CompilerPath : "";
+#endif
+
 
   TargetMachine *TM = TheTarget->createTargetMachine(
       Trip.getTriple(), CPU, Feature, Options, RM, CM, OptLevel);
@@ -540,7 +530,6 @@ extern "C" void LLVMRustDisposeTargetMachine(LLVMTargetMachineRef TM) {
   delete[] MCOptions.Argv0;
   delete[] MCOptions.CommandLineArgs.data();
 #endif
-
   delete unwrap(TM);
 }