removed old commanline arguments, applied suggested changes, made Arg0 an owned string

Author: nebulark

clang/lib/CodeGen/BackendUtil.cpp

@@ -521,8 +521,7 @@ static bool initTargetOptions(DiagnosticsEngine &Diags,
       Options.MCOptions.IASSearchPaths.push_back(
           Entry.IgnoreSysRoot ? Entry.Path : HSOpts.Sysroot + Entry.Path);
   Options.MCOptions.Argv0 = CodeGenOpts.Argv0;
-  Options.MCOptions.CommandLineArgs = CodeGenOpts.CommandLineArgs;
-  Options.MCOptions.CommandlineArgsFlat = flattenClangCommandLine(
+  Options.MCOptions.CommandlineArgs = flattenClangCommandLine(
       CodeGenOpts.CommandLineArgs, CodeGenOpts.MainFileName);
   Options.MCOptions.AsSecureLogFile = CodeGenOpts.AsSecureLogFile;
   Options.MCOptions.PPCUseFullRegisterNames =

llvm/include/llvm/MC/MCTargetOptions.h

@@ -95,15 +95,11 @@ class MCTargetOptions {
   std::string SplitDwarfFile;
   std::string AsSecureLogFile;
 
-  const char *Argv0 = nullptr;
+  // This will be set as compiler path in LF_BUILDINFO
+  std::string Argv0;
 
-  // Deprecated: Use FlatCommandlineArgs instead
-  // Arguments here are interpreted as coming from clang, formated and end up in LF_BUILDINFO as CommandLineArgs 
-  ArrayRef<std::string> CommandLineArgs;
-
-  // Arguments here end up in LF_BUILDINFO as CommandLineArgs without any additional formating
-  // If empty falls back to CommandLineArgs
-  std::string CommandlineArgsFlat;
+  // This will be set as commandline arguments in LF_BUILDINFO
+  std::string CommandlineArgs;
 
   /// Additional paths to search for `.include` directives when using the
   /// integrated assembler.

llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

@@ -893,39 +893,6 @@ static TypeIndex getStringIdTypeIdx(GlobalTypeTableBuilder &TypeTable,
   return TypeTable.writeLeafType(SIR);
 }
 
-// This just exists for backwards compatability for the deprecated MCTargetOptions::CommandLineArgs
-// It assumed a clang compiler frontend
-static std::string flattenCommandLine(ArrayRef<std::string> Args,
-                                      StringRef MainFilename) {
-  std::string FlatCmdLine;
-  raw_string_ostream OS(FlatCmdLine);
-  bool PrintedOneArg = false;
-  if (!StringRef(Args[0]).contains("-cc1")) {
-    llvm::sys::printArg(OS, "-cc1", /*Quote=*/true);
-    PrintedOneArg = true;
-  }
-  for (unsigned i = 0; i < Args.size(); i++) {
-    StringRef Arg = Args[i];
-    if (Arg.empty())
-      continue;
-    if (Arg == "-main-file-name" || Arg == "-o") {
-      i++; // Skip this argument and next one.
-      continue;
-    }
-    if (Arg.starts_with("-object-file-name") || Arg == MainFilename)
-      continue;
-    // Skip fmessage-length for reproduciability.
-    if (Arg.starts_with("-fmessage-length"))
-      continue;
-    if (PrintedOneArg)
-      OS << " ";
-    llvm::sys::printArg(OS, Arg, /*Quote=*/true);
-    PrintedOneArg = true;
-  }
-  OS.flush();
-  return FlatCmdLine;
-}
-
 void CodeViewDebug::emitBuildInfo() {
   // First, make LF_BUILDINFO. It's a sequence of strings with various bits of
   // build info. The known prefix is:
@@ -949,20 +916,11 @@ void CodeViewDebug::emitBuildInfo() {
   // FIXME: PDB is intentionally blank unless we implement /Zi type servers.
   BuildInfoArgs[BuildInfoRecord::TypeServerPDB] =
       getStringIdTypeIdx(TypeTable, "");
-  if (Asm->TM.Options.MCOptions.Argv0 != nullptr) {
-    BuildInfoArgs[BuildInfoRecord::BuildTool] =
-        getStringIdTypeIdx(TypeTable, Asm->TM.Options.MCOptions.Argv0);
+  BuildInfoArgs[BuildInfoRecord::BuildTool] =
+      getStringIdTypeIdx(TypeTable, Asm->TM.Options.MCOptions.Argv0);
+  BuildInfoArgs[BuildInfoRecord::CommandLine] = getStringIdTypeIdx(
+      TypeTable, Asm->TM.Options.MCOptions.CommandlineArgs);
 
-    if (!Asm->TM.Options.MCOptions.CommandlineArgsFlat.empty()) {
-      BuildInfoArgs[BuildInfoRecord::CommandLine] = getStringIdTypeIdx(
-          TypeTable, Asm->TM.Options.MCOptions.CommandlineArgsFlat);
-    } else {
-      BuildInfoArgs[BuildInfoRecord::CommandLine] = getStringIdTypeIdx(
-          TypeTable,
-          flattenCommandLine(Asm->TM.Options.MCOptions.CommandLineArgs,
-                             MainSourceFile->getFilename()));
-    }
-  }
   BuildInfoRecord BIR(BuildInfoArgs);
   TypeIndex BuildInfoIndex = TypeTable.writeLeafType(BIR);