Use error instead of fatal to report usage errors

[mstorsjo]

LGTM

lld/test/MinGW/driver.test

229

There's a separate test file, lib.test, with tests that overlaps this one (-l failures), but I guess it doesn't hurt to have this option tested in both.

[ruiu]

lld/test/MinGW/driver.test

229

Thank you for pointing that out. I didn't notice that. I'll remove this test from here because it seems just redundant.

lld/MinGW/Driver.cpp

opt::InputArgList MinGWOptTable::parse(ArrayRef<const char *> argv) {
   unsigned missingIndex;
   unsigned missingCount;
 
   SmallVector<const char *, 256> vec(argv.data(), argv.data() + argv.size());
   cl::ExpandResponseFiles(saver, getQuotingStyle(), vec);
   opt::InputArgList args = this->ParseArgs(vec, missingIndex, missingCount);
 
   if (missingCount)
-    fatal(StringRef(args.getArgString(missingIndex)) + ": missing argument");
+    error(StringRef(args.getArgString(missingIndex)) + ": missing argument");
   for (auto *arg : args.filtered(OPT_UNKNOWN))
-    fatal("unknown argument: " + arg->getAsString(args));
+    error("unknown argument: " + arg->getAsString(args));
   return args;
 }
 
 // Find a file by concatenating given paths.
 static Optional<std::string> findFile(StringRef path1, const Twine &path2) {
   SmallString<128> s;
   sys::path::append(s, path1, path2);
   if (sys::fs::exists(s))
searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
   }
   error("unable to find library -l" + name);
   return "";
 }
 
 // Convert Unix-ish command line arguments to Windows-ish ones and
 // then call coff::link.
 bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) {
+  enableColors(diag.has_colors());
+
   MinGWOptTable parser;
   opt::InputArgList args = parser.parse(argsArr.slice(1));
 
+  if (errorCount())
+    return false;
+
   if (args.hasArg(OPT_help)) {
     printHelp(argsArr[0]);
     return true;
   }
 
   // A note about "compatible with GNU linkers" message: this is a hack for
   // scripts generated by GNU Libtool 2.4.6 (released in February 2014 and
   // still the newest version in March 2017) or earlier to recognize LLD as
   // a GNU compatible linker. As long as an output for the -v option
   // contains "GNU" or "with BFD", they recognize us as GNU-compatible.
   if (args.hasArg(OPT_v) || args.hasArg(OPT_version))
     message(getLLDVersion() + " (compatible with GNU linkers)");
 
   // The behavior of -v or --version is a bit strange, but this is
   // needed for compatibility with GNU linkers.
   if (args.hasArg(OPT_v) && !args.hasArg(OPT_INPUT) && !args.hasArg(OPT_l))
     return true;
   if (args.hasArg(OPT_version))
     return true;
 
-  if (!args.hasArg(OPT_INPUT) && !args.hasArg(OPT_l))
-    fatal("no input files");
+  if (!args.hasArg(OPT_INPUT) && !args.hasArg(OPT_l)) {
+    error("no input files");
+    return false;
+  }
 
   std::vector<std::string> linkArgs;
   auto add = [&](const Twine &s) { linkArgs.push_back(s.str()); };
 
   add("lld-link");
   add("-lldmingw");
 
   if (auto *a = args.getLastArg(OPT_entry)) {
bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) {
 
   if (auto *a = args.getLastArg(OPT_icf)) {
     StringRef s = a->getValue();
     if (s == "all")
       add("-opt:icf");
     else if (s == "safe" || s == "none")
       add("-opt:noicf");
     else
-      fatal("unknown parameter: --icf=" + s);
+      error("unknown parameter: --icf=" + s);
   } else {
     add("-opt:noicf");
   }
 
   if (auto *a = args.getLastArg(OPT_m)) {
     StringRef s = a->getValue();
     if (s == "i386pe")
       add("-machine:x86");
     else if (s == "i386pep")
       add("-machine:x64");
     else if (s == "thumb2pe")
       add("-machine:arm");
     else if (s == "arm64pe")
       add("-machine:arm64");
     else
-      fatal("unknown parameter: -m" + s);
+      error("unknown parameter: -m" + s);
   }
 
   for (auto *a : args.filtered(OPT_mllvm))
     add("-mllvm:" + StringRef(a->getValue()));
 
   for (auto *a : args.filtered(OPT_Xlink))
     add(a->getValue());
 

lld/test/MinGW/driver.test

 
 RUN: ld.lld -m i386pep --help 2>&1 | FileCheck -check-prefix=HELP %s
 HELP: USAGE:
 HELP: --enable-auto-import
 
 RUN: ld.lld -### -m i386pep foo.o -delayload user32.dll --delayload shell32.dll | FileCheck -check-prefix DELAYLOAD %s
 RUN: ld.lld -### -m i386pep foo.o -delayload=user32.dll --delayload=shell32.dll | FileCheck -check-prefix DELAYLOAD %s
 DELAYLOAD: -delayload:user32.dll -delayload:shell32.dll
+
+RUN: not ld.lld -m i386pep -entry 2>&1 | FileCheck -check-prefix MISSING_ARG %s
+MISSING_ARG: error: -entry: missing argument
+
+RUN: not ld.lld -m i386pep --foo 2>&1 | FileCheck -check-prefix UNKNOWN_ARG %s
+UNKNOWN_ARG: error: unknown argument: --foo
+
+RUN: not ld.lld -m i386pep 2>&1 | FileCheck -check-prefix NO_INPUT_FILES %s
+NO_INPUT_FILES: error: no input files