[MachO] Use error instead of fatal for missing -arch

[smeenai]

Summary

fatal should only be used for malformed inputs according to
ErrorHandler.h; error is more appropriate for missing arguments,
accompanied by a check to bail out early in case of the error. Some
tests need to be adjusted accordingly.

Makes lld/test/MachO/arch.s pass with LLD_IN_TEST=2.

[int3]

lld/test/MachO/color-diagnostics.test

9

do we really need to test this particular error? I was under the impression that this test was meant solely to test that the correct ANSI color codes were emitted, and the exact error message isn't so important

lld/test/MachO/search-paths-darwin.test

6

hm, why can't we use %lld here?

[smeenai]

lld/test/MachO/color-diagnostics.test

9

I was trying to preserve the behavior of the original, but yeah, I don't think there's any value to the additional test.

lld/test/MachO/search-paths-darwin.test

6

It adds a -syslibroot argument, which we want to avoid for this test.

[smeenai]

Address review comments

[int3]

ah makes sense. Thanks!

lld/MachO/Driver.cpp

static PlatformKind parsePlatformVersion(const ArgList &args) {
   if (config->platformInfo.sdk.tryParse(sdkVersionStr))
     error(Twine("malformed sdk version: ") + sdkVersionStr);
   return platform;
 }
 
 // Has the side-effect of setting Config::target.
 static TargetInfo *createTargetInfo(InputArgList &args) {
   StringRef archName = args.getLastArgValue(OPT_arch);
-  if (archName.empty())
-    fatal("must specify -arch");
-  PlatformKind platform = parsePlatformVersion(args);
+  if (archName.empty()) {
+    error("must specify -arch");
+    return nullptr;
+  }
 
+  PlatformKind platform = parsePlatformVersion(args);
   config->platformInfo.target =
       MachO::Target(getArchitectureFromName(archName), platform);
 
   uint32_t cpuType;
   uint32_t cpuSubtype;
   std::tie(cpuType, cpuSubtype) = getCPUTypeFromArchitecture(config->arch());
 
   switch (cpuType) {
   case CPU_TYPE_X86_64:
     return createX86_64TargetInfo();
   case CPU_TYPE_ARM64:
     return createARM64TargetInfo();
   case CPU_TYPE_ARM64_32:
     return createARM64_32TargetInfo();
   case CPU_TYPE_ARM:
     return createARMTargetInfo(cpuSubtype);
   default:
-    fatal("missing or unsupported -arch " + archName);
+    error("missing or unsupported -arch " + archName);
+    return nullptr;
   }
 }
 
 static UndefinedSymbolTreatment
 getUndefinedSymbolTreatment(const ArgList &args) {
   StringRef treatmentStr = args.getLastArgValue(OPT_undefined);
   auto treatment =
       StringSwitch<UndefinedSymbolTreatment>(treatmentStr)
if (args.hasArg(OPT_version)) {
     return true;
   }
 
   config = make<Configuration>();
   symtab = make<SymbolTable>();
   target = createTargetInfo(args);
   depTracker =
       make<DependencyTracker>(args.getLastArgValue(OPT_dependency_info));
+  if (errorCount())
+    return false;
 
   config->osoPrefix = args.getLastArgValue(OPT_oso_prefix);
   if (!config->osoPrefix.empty()) {
     // Expand special characters, such as ".", "..", or  "~", if present.
     // Note: LD64 only expands "." and not other special characters.
     // That seems silly to imitate so we will not try to follow it, but rather
     // just use real_path() to do it.
 

lld/test/MachO/color-diagnostics.test

 # Windows command prompt doesn't support ANSI escape sequences.
 # REQUIRES: shell
 
-# RUN: not %lld -xyz --color-diagnostics /nosuchfile 2>&1 \
-# RUN:   | FileCheck -check-prefix=COLOR %s
-# RUN: not %lld -xyz --color-diagnostics=always /nosuchfile 2>&1 \
-# RUN:   | FileCheck -check-prefix=COLOR %s
+# RUN: not %lld -xyz --color-diagnostics 2>&1 \
+# RUN:   | FileCheck -check-prefix=COLOR-UNKNOWN-ARGUMENT %s
+# RUN: not %lld -xyz --color-diagnostics=always 2>&1 \
+# RUN:   | FileCheck -check-prefix=COLOR-UNKNOWN-ARGUMENT %s
 
-# COLOR: {{lld: .\[0;31merror: .\[0munknown argument '-xyz'}}
-# COLOR: {{lld: .\[0;31merror: .\[0mcannot open /nosuchfile}}
+# COLOR-UNKNOWN-ARGUMENT: {{lld: .\[0;31merror: .\[0munknown argument '-xyz'}}
+
+# RUN: not %lld --color-diagnostics /nosuchfile 2>&1 \
+# RUN:   | FileCheck -check-prefix=COLOR-NO-SUCH-FILE %s
+# RUN: not %lld --color-diagnostics=always /nosuchfile 2>&1 \
+# RUN:   | FileCheck -check-prefix=COLOR-NO-SUCH-FILE %s
+
+# COLOR-NO-SUCH-FILE: {{lld: .\[0;31merror: .\[0mcannot open /nosuchfile}}
 
 # RUN: not %lld --color-diagnostics=foobar 2>&1 | FileCheck -check-prefix=ERR %s
 # ERR: unknown option: --color-diagnostics=foobar
 
 # RUN: not %lld /nosuchfile 2>&1 | FileCheck -check-prefix=NOCOLOR %s
 # RUN: not %lld --color-diagnostics=never /nosuchfile 2>&1 \
 # RUN:   | FileCheck -check-prefix=NOCOLOR %s
 # RUN: not %lld --color-diagnostics=always --no-color-diagnostics \
 # RUN:   /nosuchfile 2>&1 | FileCheck -check-prefix=NOCOLOR %s
 
 # NOCOLOR: lld: error: cannot open /nosuchfile

lld/test/MachO/driver.test

 # RUN: %lld --version | FileCheck -check-prefix=VERSION %s
 VERSION: LLD
 
 # RUN: not %lld ---help 2>&1 | FileCheck -check-prefix=SPELLHELP %s
 SPELLHELP: error: unknown argument '---help', did you mean '--help'
-# FIXME: This should say "no input files" instead
-SPELLHELP: error: undefined symbol: _main
+# FIXME: We should also output a "no input files" error

lld/test/MachO/search-paths-darwin.test

 REQUIRES: x86
 REQUIRES: system-darwin
 
 RUN: mkdir -p %t1 %t2
 
-RUN: not ld64.lld -arch x86_64 -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s
+RUN: not ld64.lld -arch x86_64 -platform_version macos 10.5 11.0 -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s
 CHECK:      Library search paths:
 CHECK-NEXT: [[LDIR]]
 CHECK-NEXT: /usr/lib
 CHECK: Framework search paths:
 CHECK-NEXT: [[FDIR]]
 CHECK-NEXT: /Library/Frameworks
 CHECK-NEXT: /System/Library/Frameworks
 
-RUN: not ld64.lld -arch x86_64 -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s
+RUN: not ld64.lld -arch x86_64 -platform_version macos 10.5 11.0 -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s
 CHECK_Z:      Library search paths:
 CHECK_Z-NEXT: [[LDIR]]
 CHECK_Z-NEXT: Framework search paths:
 CHECK_Z-NEXT: [[FDIR]]