[SupplementaryOutputs][NFC] Simplify boilerplate output checks.

Reduce some boilerplate code to check if supplementary outputs exist.

Author: cachemeifyoucan

include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -259,24 +259,15 @@ class FrontendInputsAndOutputs {
       llvm::function_ref<const std::string &(const SupplementaryOutputPaths &)>
           extractorFn) const;
 
-  bool hasDependenciesPath() const;
-  bool hasReferenceDependenciesPath() const;
-  bool hasClangHeaderOutputPath() const;
-  bool hasLoadedModuleTracePath() const;
-  bool hasModuleOutputPath() const;
-  bool hasModuleDocOutputPath() const;
-  bool hasModuleSourceInfoOutputPath() const;
-  bool hasModuleInterfaceOutputPath() const;
-  bool hasPrivateModuleInterfaceOutputPath() const;
-  bool hasPackageModuleInterfaceOutputPath() const;
-  bool hasABIDescriptorOutputPath() const;
-  bool hasAPIDescriptorOutputPath() const;
-  bool hasConstValuesOutputPath() const;
-  bool hasModuleSemanticInfoOutputPath() const;
-  bool hasModuleSummaryOutputPath() const;
-  bool hasTBDPath() const;
-  bool hasYAMLOptRecordPath() const;
-  bool hasBitstreamOptRecordPath() const;
+#define OUTPUT(NAME, TYPE)                                                     \
+  bool has##NAME() const {                                                     \
+    return hasSupplementaryOutputPath(                                         \
+        [](const SupplementaryOutputPaths &outs) -> const std::string & {      \
+          return outs.NAME;                                                    \
+        });                                                                    \
+  }
+#include "swift/Basic/SupplementaryOutputPaths.def"
+#undef OUTPUT
 
   bool hasDependencyTrackerPath() const;
 };

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -750,12 +750,12 @@ bool ArgsToFrontendOptionsConverter::checkBuildFromInterfaceOnlyOptions()
 bool ArgsToFrontendOptionsConverter::checkUnusedSupplementaryOutputPaths()
     const {
   if (!FrontendOptions::canActionEmitDependencies(Opts.RequestedAction) &&
-      Opts.InputsAndOutputs.hasDependenciesPath()) {
+      Opts.InputsAndOutputs.hasDependenciesFilePath()) {
     Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_dependencies);
     return true;
   }
   if (!FrontendOptions::canActionEmitReferenceDependencies(Opts.RequestedAction)
-      && Opts.InputsAndOutputs.hasReferenceDependenciesPath()) {
+      && Opts.InputsAndOutputs.hasReferenceDependenciesFilePath()) {
     Diags.diagnose(SourceLoc(),
                    diag::error_mode_cannot_emit_reference_dependencies);
     return true;

lib/Frontend/FrontendInputsAndOutputs.cpp

@@ -464,117 +464,8 @@ bool FrontendInputsAndOutputs::hasSupplementaryOutputPath(
   });
 }
 
-bool FrontendInputsAndOutputs::hasDependenciesPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.DependenciesFilePath;
-      });
-}
-bool FrontendInputsAndOutputs::hasReferenceDependenciesPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ReferenceDependenciesFilePath;
-      });
-}
-bool FrontendInputsAndOutputs::hasClangHeaderOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ClangHeaderOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasLoadedModuleTracePath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.LoadedModuleTracePath;
-      });
-}
-bool FrontendInputsAndOutputs::hasModuleOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ModuleOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasModuleDocOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ModuleDocOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasModuleSourceInfoOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ModuleSourceInfoOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasModuleInterfaceOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ModuleInterfaceOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasPrivateModuleInterfaceOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.PrivateModuleInterfaceOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasPackageModuleInterfaceOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.PackageModuleInterfaceOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasABIDescriptorOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ABIDescriptorOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasAPIDescriptorOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.APIDescriptorOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasConstValuesOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ConstValuesOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasModuleSemanticInfoOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ModuleSemanticInfoOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasModuleSummaryOutputPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.ModuleSummaryOutputPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasTBDPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.TBDPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasYAMLOptRecordPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.YAMLOptRecordPath;
-      });
-}
-bool FrontendInputsAndOutputs::hasBitstreamOptRecordPath() const {
-  return hasSupplementaryOutputPath(
-      [](const SupplementaryOutputPaths &outs) -> const std::string & {
-        return outs.BitstreamOptRecordPath;
-      });
-}
-
 bool FrontendInputsAndOutputs::hasDependencyTrackerPath() const {
-  return hasDependenciesPath() || hasReferenceDependenciesPath() ||
+  return hasDependenciesFilePath() || hasReferenceDependenciesFilePath() ||
          hasLoadedModuleTracePath();
 }
 

lib/FrontendTool/FrontendTool.cpp

@@ -664,7 +664,7 @@ static void emitSwiftdepsForAllPrimaryInputsIfNeeded(
     CompilerInstance &Instance) {
   const auto &Invocation = Instance.getInvocation();
   if (Invocation.getFrontendOptions()
-          .InputsAndOutputs.hasReferenceDependenciesPath() &&
+          .InputsAndOutputs.hasReferenceDependenciesFilePath() &&
       Instance.getPrimarySourceFiles().empty()) {
     Instance.getDiags().diagnose(
         SourceLoc(), diag::emit_reference_dependencies_without_primary_file);