Emit an error for unsupported object file formats in the triple

Author: kubamracek

include/swift/AST/DiagnosticsFrontend.def

@@ -36,6 +36,9 @@ ERROR(error_unsupported_target_os, none,
 ERROR(error_unsupported_target_arch, none,
       "unsupported target architecture: '%0'", (StringRef))
 
+ERROR(error_unsupported_object_file_format, none,
+      "unsupported object file format: '%0'", (StringRef))
+
 WARNING(warning_upcoming_feature_on_by_default, none,
         "upcoming feature '%0' is already enabled as of Swift version %1",
         (StringRef, unsigned))

include/swift/Basic/LangOptions.h

@@ -652,11 +652,9 @@ namespace swift {
     LangOptions();
 
     /// Sets the target we are building for and updates platform conditions
-    /// to match.
-    ///
-    /// \returns A pair - the first element is true if the OS was invalid.
-    /// The second element is true if the Arch was invalid.
-    std::pair<bool, bool> setTarget(llvm::Triple triple);
+    /// to match. Emits errors using `Diags` in case of an invalid OS, arch,
+    /// etc.
+    void setTarget(llvm::Triple triple, swift::DiagnosticEngine *Diags = nullptr);
 
     /// Returns the minimum platform version to which code will be deployed.
     ///

lib/Basic/LangOptions.cpp

@@ -17,6 +17,7 @@
 
 #include "swift/Basic/LangOptions.h"
 #include "swift/AST/DiagnosticEngine.h"
+#include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/Basic/Assertions.h"
 #include "swift/Basic/Feature.h"
 #include "swift/Basic/FileTypes.h"
@@ -489,7 +490,8 @@ static bool isMultiThreadedRuntime(llvm::Triple triple) {
   return true;
 }
 
-std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
+void LangOptions::setTarget(llvm::Triple triple,
+                            swift::DiagnosticEngine *Diags) {
   clearAllPlatformConditionValues();
   clearAtomicBitWidths();
 
@@ -574,6 +576,11 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
     break;
   }
 
+  if (UnsupportedOS && Diags) {
+    Diags->diagnose(SourceLoc(), diag::error_unsupported_target_os,
+                    Target.getOSName());
+  }
+
   bool UnsupportedArch = false;
 
   // Set the "arch" platform condition.
@@ -632,8 +639,10 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
     }
   }
 
-  if (UnsupportedOS || UnsupportedArch)
-    return { UnsupportedOS, UnsupportedArch };
+  if (UnsupportedArch && Diags) {
+    Diags->diagnose(SourceLoc(), diag::error_unsupported_target_arch,
+                    Target.getArchName());
+  }
 
   // Set the "_endian" platform condition.
   if (Target.isLittleEndian()) {
@@ -660,6 +669,11 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
     addPlatformConditionValue(PlatformConditionKind::ObjectFileFormat, "COFF");
   } else if (Target.isOSBinFormatWasm()) {
     addPlatformConditionValue(PlatformConditionKind::ObjectFileFormat, "Wasm");
+  } else {
+    if (Diags) {
+      Diags->diagnose(SourceLoc(), diag::error_unsupported_object_file_format,
+                      Target.getObjectFormatTypeName(Target.getObjectFormat()));
+    }
   }
 
   // Set the "runtime" platform condition.
@@ -695,8 +709,6 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
   // If you add anything to this list, change the default size of
   // PlatformConditionValues to not require an extra allocation
   // in the common case.
-
-  return { false, false };
 }
 
 llvm::StringRef swift::getPlaygroundOptionName(PlaygroundOption option) {

lib/Frontend/CompilerInvocation.cpp

@@ -409,7 +409,7 @@ void CompilerInvocation::setTargetTriple(StringRef Triple) {
 }
 
 void CompilerInvocation::setTargetTriple(const llvm::Triple &Triple) {
-  LangOpts.setTarget(Triple);
+  LangOpts.setTarget(Triple, /*Diags*/nullptr);
   updateRuntimeLibraryPaths(SearchPathOpts, FrontendOpts, LangOpts);
 }
 
@@ -1474,12 +1474,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.SkipNonExportableDecls = false;
 
   llvm::Triple Target = Opts.Target;
-  StringRef TargetArg;
-  std::string TargetArgScratch;
-
   if (const Arg *A = Args.getLastArg(OPT_target)) {
     Target = llvm::Triple(A->getValue());
-    TargetArg = A->getValue();
 
     const bool targetNeedsRemapping = Target.isXROS();
     if (targetNeedsRemapping && Target.getOSMajorVersion() == 0) {
@@ -1506,8 +1502,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     if (tripleInfersSimulatorEnvironment(Target)) {
       // Set the simulator environment.
       Target.setEnvironment(llvm::Triple::EnvironmentType::Simulator);
-      TargetArgScratch = Target.str();
-      TargetArg = TargetArgScratch;
     }
   }
 
@@ -1562,21 +1556,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
 
   // Must be processed after any other language options that could affect
   // platform conditions.
-  bool UnsupportedOS, UnsupportedArch;
-  std::tie(UnsupportedOS, UnsupportedArch) = Opts.setTarget(Target);
-
-  SmallVector<StringRef, 3> TargetComponents;
-  TargetArg.split(TargetComponents, "-");
-
-  if (UnsupportedArch) {
-    auto TargetArgArch = TargetComponents.size() ? TargetComponents[0] : "";
-    Diags.diagnose(SourceLoc(), diag::error_unsupported_target_arch, TargetArgArch);
-  }
-
-  if (UnsupportedOS) {
-    auto TargetArgOS = TargetComponents.size() > 2 ? TargetComponents[2] : "";
-    Diags.diagnose(SourceLoc(), diag::error_unsupported_target_os, TargetArgOS);
-  }
+  Opts.setTarget(Target, &Diags);
 
   // First, set up default minimum inlining target versions.
   auto getDefaultMinimumInliningTargetVersion =
@@ -1827,7 +1807,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.enableFeature(Feature::ParserValidation);
   }
 #endif
-  return HadError || UnsupportedOS || UnsupportedArch;
+  return HadError || Diags.hasFatalErrorOccurred();
 }
 
 static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,

unittests/Basic/CMakeLists.txt

@@ -49,6 +49,7 @@ add_dependencies(SwiftBasicTests "${gyb_dependency_targets}")
 target_link_libraries(SwiftBasicTests
   PRIVATE
   swiftBasic
+  swiftFrontend
   swiftOption
   swiftThreading
   clangBasic