[LDC] LLD: Avoid parsing -mllvm* command-line options if there aren't any

kinke · kinke · commit 01bc5ec5d9b3 · 2023-11-30T01:36:55.000+01:00
When invoking the integrated LLD from LDC, it somehow uses a different
global LLVM command-line parser, one with no registered options, so
parsing is guaranteed to fail, even if there are no args.
[It's only needed for LTO codegen options anyway.]
diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
@@ -1485,8 +1485,10 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
     v.push_back(arg->getValue());
     config->mllvmOpts.emplace_back(arg->getValue());
   }
-  cl::ResetAllOptionOccurrences();
-  cl::ParseCommandLineOptions(v.size(), v.data());
+  if (v.size() > 1) {
+    cl::ResetAllOptionOccurrences();
+    cl::ParseCommandLineOptions(v.size(), v.data());
+  }
 
   // Handle /errorlimit early, because error() depends on it.
   if (auto *arg = args.getLastArg(OPT_errorlimit)) {
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
@@ -1125,8 +1125,10 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
   v.push_back("wasm-ld (LLVM option parsing)");
   for (auto *arg : args.filtered(OPT_mllvm))
     v.push_back(arg->getValue());
-  cl::ResetAllOptionOccurrences();
-  cl::ParseCommandLineOptions(v.size(), v.data());
+  if (v.size() > 1) {
+    cl::ResetAllOptionOccurrences();
+    cl::ParseCommandLineOptions(v.size(), v.data());
+  }
 
   readConfigs(args);
   setConfigs();
