Consistently get extensions from swift/Frontend/FileTypes.h

...instead of sometimes hardcoding them and sometimes using Strings.h.
The exceptions are the libraries that sit below Frontend; these can
continue using strings.

Author: jrose-apple

include/swift/Frontend/FrontendOptions.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_FRONTEND_FRONTENDOPTIONS_H
 #define SWIFT_FRONTEND_FRONTENDOPTIONS_H
 
+#include "swift/Frontend/FileTypes.h"
 #include "swift/Frontend/FrontendInputsAndOutputs.h"
 #include "swift/Frontend/InputFile.h"
 #include "llvm/ADT/Hashing.h"
@@ -312,7 +313,7 @@ class FrontendOptions {
   static bool doesActionProduceOutput(ActionType);
   static bool doesActionProduceTextualOutput(ActionType);
   static bool needsProperModuleName(ActionType);
-  static StringRef suffixForPrincipalOutputFileForAction(ActionType);
+  static file_types::ID formatForPrincipalOutputFileForAction(ActionType);
 };
 
 }

include/swift/Frontend/Types.def

@@ -46,13 +46,15 @@ TYPE("object",              Object,                    "o",               "")
 TYPE("dSYM",                dSYM,                      "dSYM",            "")
 TYPE("dependencies",        Dependencies,              "d",               "")
 TYPE("autolink",            AutolinkFile,              "autolink",        "")
-TYPE("swiftmodule",         SwiftModuleFile,           "swiftmodule",     "")
-TYPE("swiftdoc",            SwiftModuleDocFile,        "swiftdoc",        "")
+TYPE("swiftmodule",         SwiftModuleFile,
+                              SERIALIZED_MODULE_EXTENSION,                "")
+TYPE("swiftdoc",            SwiftModuleDocFile,
+                              SERIALIZED_MODULE_DOC_EXTENSION,            "")
 TYPE("swiftinterface",      SwiftModuleInterfaceFile,  "swiftinterface",  "")
 TYPE("assembly",            Assembly,                  "s",               "")
 TYPE("raw-sil",             RawSIL,                    "sil",             "")
 TYPE("raw-sib",             RawSIB,                    "sib",             "")
-TYPE("llvm-ir",             LLVM_IR,                   "ir",              "")
+TYPE("llvm-ir",             LLVM_IR,                   "ll",              "")
 TYPE("llvm-bc",             LLVM_BC,                   "bc",              "")
 TYPE("diagnostics",         SerializedDiagnostics,     "dia",             "")
 TYPE("objc-header",         ObjCHeader,                "h",               "")
@@ -66,7 +68,7 @@ TYPE("opt-record",          OptRecord,                 "opt.yaml",        "")
 
 // Misc types
 TYPE("pcm",                 ClangModuleFile,           "pcm",             "")
-TYPE("pch",                 PCH,                       "pch",             "")
+TYPE("pch",                 PCH,                       PCH_EXTENSION,     "")
 TYPE("none",                Nothing,                   "",                "")
 
 #undef TYPE

include/swift/Strings.h

@@ -24,15 +24,6 @@ constexpr static const char SERIALIZED_MODULE_EXTENSION[] = "swiftmodule";
 constexpr static const char SERIALIZED_MODULE_DOC_EXTENSION[] = "swiftdoc";
 /// The extension for PCH files.
 constexpr static const char PCH_EXTENSION[] = "pch";
-/// The extension for replacement map files.
-constexpr static const char REMAP_EXTENSION[] = "remap";
-/// The extension for SIL files.
-constexpr static const char SIL_EXTENSION[] = "sil";
-/// The extension for SIB files.
-constexpr static const char SIB_EXTENSION[] = "sib";
-/// The extension for LLVM IR files.
-constexpr static const char LLVM_BC_EXTENSION[] = "bc";
-constexpr static const char LLVM_IR_EXTENSION[] = "ll";
 /// The name of the standard library, which is a reserved module name.
 constexpr static const char STDLIB_NAME[] = "Swift";
 /// The name of the Onone support library, which is a reserved module name.

lib/Frontend/ArgsToFrontendOutputsConverter.cpp

@@ -117,11 +117,14 @@ OutputFilesComputer::create(const llvm::opt::ArgList &args,
     return None;
   }
 
+  const file_types::ID outputType =
+      FrontendOptions::formatForPrincipalOutputFileForAction(requestedAction);
+
   return OutputFilesComputer(
       diags, inputsAndOutputs, std::move(outputFileArguments),
       outputDirectoryArgument, firstInput, requestedAction,
       args.getLastArg(options::OPT_module_name),
-      FrontendOptions::suffixForPrincipalOutputFileForAction(requestedAction),
+      file_types::getExtension(outputType),
       FrontendOptions::doesActionProduceTextualOutput(requestedAction));
 }
 
@@ -354,36 +357,41 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
   using namespace options;
 
   auto dependenciesFilePath = determineSupplementaryOutputFilename(
-      OPT_emit_dependencies, pathsFromArguments.DependenciesFilePath, "d", "",
+      OPT_emit_dependencies, pathsFromArguments.DependenciesFilePath,
+      file_types::TY_Dependencies, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   auto referenceDependenciesFilePath = determineSupplementaryOutputFilename(
       OPT_emit_reference_dependencies,
-      pathsFromArguments.ReferenceDependenciesFilePath, "swiftdeps", "",
+      pathsFromArguments.ReferenceDependenciesFilePath,
+      file_types::TY_SwiftDeps, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   auto serializedDiagnosticsPath = determineSupplementaryOutputFilename(
       OPT_serialize_diagnostics, pathsFromArguments.SerializedDiagnosticsPath,
-      "dia", "", defaultSupplementaryOutputPathExcludingExtension);
+      file_types::TY_SerializedDiagnostics, "",
+      defaultSupplementaryOutputPathExcludingExtension);
 
   // There is no non-path form of -emit-fixits-path
   auto fixItsOutputPath = pathsFromArguments.FixItsOutputPath;
 
   auto objcHeaderOutputPath = determineSupplementaryOutputFilename(
-      OPT_emit_objc_header, pathsFromArguments.ObjCHeaderOutputPath, "h", "",
+      OPT_emit_objc_header, pathsFromArguments.ObjCHeaderOutputPath,
+      file_types::TY_ObjCHeader, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   auto loadedModuleTracePath = determineSupplementaryOutputFilename(
       OPT_emit_loaded_module_trace, pathsFromArguments.LoadedModuleTracePath,
-      "trace.json", "", defaultSupplementaryOutputPathExcludingExtension);
+      file_types::TY_ModuleTrace, "",
+      defaultSupplementaryOutputPathExcludingExtension);
 
   auto tbdPath = determineSupplementaryOutputFilename(
-      OPT_emit_tbd, pathsFromArguments.TBDPath, "tbd", "",
+      OPT_emit_tbd, pathsFromArguments.TBDPath, file_types::TY_TBD, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   auto moduleDocOutputPath = determineSupplementaryOutputFilename(
       OPT_emit_module_doc, pathsFromArguments.ModuleDocOutputPath,
-      SERIALIZED_MODULE_DOC_EXTENSION, "",
+      file_types::TY_SwiftModuleDocFile, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   // There is no non-path form of -emit-interface-path
@@ -396,8 +404,8 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
                              mainOutputIfUsableForModule);
 
   auto moduleOutputPath = determineSupplementaryOutputFilename(
-      emitModuleOption, pathsFromArguments.ModuleOutputPath, moduleExtension,
-      mainOutputIfUsableForModule,
+      emitModuleOption, pathsFromArguments.ModuleOutputPath,
+      file_types::TY_SwiftModuleFile, mainOutputIfUsableForModule,
       defaultSupplementaryOutputPathExcludingExtension);
 
   SupplementaryOutputPaths sop;
@@ -429,7 +437,7 @@ StringRef SupplementaryOutputPathsComputer::
 
 std::string
 SupplementaryOutputPathsComputer::determineSupplementaryOutputFilename(
-    options::ID emitOpt, std::string pathFromArguments, StringRef extension,
+    options::ID emitOpt, std::string pathFromArguments, file_types::ID type,
     StringRef mainOutputIfUsable,
     StringRef defaultSupplementaryOutputPathExcludingExtension) const {
 
@@ -444,7 +452,7 @@ SupplementaryOutputPathsComputer::determineSupplementaryOutputFilename(
   }
 
   llvm::SmallString<128> path(defaultSupplementaryOutputPathExcludingExtension);
-  llvm::sys::path::replace_extension(path, extension);
+  llvm::sys::path::replace_extension(path, file_types::getExtension(type));
   return path.str().str();
 };
 
@@ -464,7 +472,8 @@ void SupplementaryOutputPathsComputer::deriveModulePathParameters(
       RequestedAction == FrontendOptions::ActionType::MergeModules ||
       RequestedAction == FrontendOptions::ActionType::EmitModuleOnly || isSIB;
 
-  extension = isSIB ? SIB_EXTENSION : SERIALIZED_MODULE_EXTENSION;
+  extension = file_types::getExtension(
+      isSIB ? file_types::TY_SIB : file_types::TY_SwiftModuleFile);
 
   mainOutputIfUsable =
       canUseMainOutputForModule && !OutputFiles.empty() ? OutputFiles[0] : "";

lib/Frontend/ArgsToFrontendOutputsConverter.h

@@ -164,7 +164,7 @@ class SupplementaryOutputPathsComputer {
   /// \return empty string if no output file.
   std::string determineSupplementaryOutputFilename(
       options::ID emitOpt, std::string pathFromArgumentsOrFilelists,
-      StringRef extension, StringRef mainOutputIfUsable,
+      file_types::ID type, StringRef mainOutputIfUsable,
       StringRef defaultSupplementaryOutputPathExcludingExtension) const;
 
   void deriveModulePathParameters(options::ID &emitOption,

lib/Frontend/FrontendInputsAndOutputs.cpp

@@ -14,6 +14,7 @@
 
 #include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/Basic/PrimarySpecificPaths.h"
+#include "swift/Frontend/FileTypes.h"
 #include "swift/Frontend/FrontendOptions.h"
 #include "swift/Option/Options.h"
 #include "swift/Parse/Lexer.h"
@@ -155,9 +156,14 @@ unsigned FrontendInputsAndOutputs::numberOfPrimaryInputsEndingWith(
 
 bool FrontendInputsAndOutputs::shouldTreatAsLLVM() const {
   if (hasSingleInput()) {
-    StringRef Input(getFilenameOfFirstInput());
-    return llvm::sys::path::extension(Input).endswith(LLVM_BC_EXTENSION) ||
-           llvm::sys::path::extension(Input).endswith(LLVM_IR_EXTENSION);
+    StringRef InputExt = llvm::sys::path::extension(getFilenameOfFirstInput());
+    switch (file_types::lookupTypeForExtension(InputExt)) {
+    case file_types::TY_LLVM_BC:
+    case file_types::TY_LLVM_IR:
+      return true;
+    default:
+      return false;
+    }
   }
   return false;
 }
@@ -166,12 +172,13 @@ bool FrontendInputsAndOutputs::shouldTreatAsSIL() const {
   if (hasSingleInput()) {
     // If we have exactly one input filename, and its extension is "sil",
     // treat the input as SIL.
-    const std::string &Input(getFilenameOfFirstInput());
-    return llvm::sys::path::extension(Input).endswith(SIL_EXTENSION);
+    StringRef extension = llvm::sys::path::extension(getFilenameOfFirstInput());
+    return file_types::lookupTypeForExtension(extension) == file_types::TY_SIL;
   }
   // If we have one primary input and it's a filename with extension "sil",
   // treat the input as SIL.
-  unsigned silPrimaryCount = numberOfPrimaryInputsEndingWith(SIL_EXTENSION);
+  const unsigned silPrimaryCount = numberOfPrimaryInputsEndingWith(
+      file_types::getExtension(file_types::TY_SIL));
   if (silPrimaryCount == 0)
     return false;
   if (silPrimaryCount == primaryInputCount()) {
@@ -186,7 +193,8 @@ bool FrontendInputsAndOutputs::areAllNonPrimariesSIB() const {
   for (const InputFile &input : AllInputs) {
     if (input.isPrimary())
       continue;
-    if (!llvm::sys::path::extension(input.file()).endswith(SIB_EXTENSION)) {
+    StringRef extension = llvm::sys::path::extension(input.file());
+    if (file_types::lookupTypeForExtension(extension) != file_types::TY_SIB) {
       return false;
     }
   }

lib/Frontend/FrontendOptions.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -130,11 +130,13 @@ void FrontendOptions::forAllOutputPaths(
   }
 }
 
-StringRef
-FrontendOptions::suffixForPrincipalOutputFileForAction(ActionType action) {
+file_types::ID
+FrontendOptions::formatForPrincipalOutputFileForAction(ActionType action) {
+  using namespace file_types;
+
   switch (action) {
   case ActionType::NoneAction:
-    return StringRef();
+    return TY_Nothing;
 
   case ActionType::Parse:
   case ActionType::ResolveImports:
@@ -146,42 +148,46 @@ FrontendOptions::suffixForPrincipalOutputFileForAction(ActionType action) {
   case ActionType::PrintAST:
   case ActionType::DumpScopeMaps:
   case ActionType::DumpTypeRefinementContexts:
-    return StringRef();
+    return TY_Nothing;
 
   case ActionType::EmitPCH:
-    return PCH_EXTENSION;
+    return TY_PCH;
 
   case ActionType::EmitSILGen:
+    return TY_RawSIL;
+
   case ActionType::EmitSIL:
-    return SIL_EXTENSION;
+    return TY_SIL;
 
   case ActionType::EmitSIBGen:
+    return TY_RawSIB;
+
   case ActionType::EmitSIB:
-    return SIB_EXTENSION;
+    return TY_SIB;
 
   case ActionType::MergeModules:
   case ActionType::EmitModuleOnly:
-    return SERIALIZED_MODULE_EXTENSION;
+    return TY_SwiftModuleFile;
 
   case ActionType::Immediate:
   case ActionType::REPL:
     // These modes have no frontend-generated output.
-    return StringRef();
+    return TY_Nothing;
 
   case ActionType::EmitAssembly:
-    return "s";
+    return TY_Assembly;
 
   case ActionType::EmitIR:
-    return "ll";
+    return TY_LLVM_IR;
 
   case ActionType::EmitBC:
-    return "bc";
+    return TY_LLVM_BC;
 
   case ActionType::EmitObject:
-    return "o";
+    return TY_Object;
 
   case ActionType::EmitImportedModules:
-    return "importedmodules";
+    return TY_ImportedModules;
   }
 }
 

lib/Frontend/Types.cpp

@@ -12,6 +12,7 @@
 
 #include "swift/Frontend/FileTypes.h"
 
+#include "swift/Strings.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/ErrorHandling.h"

tools/sil-func-extractor/SILFunctionExtractor.cpp

@@ -26,6 +26,7 @@
 #include "swift/Demangling/Demangle.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "swift/Frontend/DiagnosticVerifier.h"
+#include "swift/Frontend/FileTypes.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/SIL/SILBuilder.h"
@@ -347,10 +348,12 @@ int main(int argc, char **argv) {
       OutputFile = OutputFilename;
     } else if (ModuleName.size()) {
       OutputFile = ModuleName;
-      llvm::sys::path::replace_extension(OutputFile, SIB_EXTENSION);
+      llvm::sys::path::replace_extension(
+          OutputFile, file_types::getExtension(file_types::TY_SIB));
     } else {
       OutputFile = CI.getMainModule()->getName().str();
-      llvm::sys::path::replace_extension(OutputFile, SIB_EXTENSION);
+      llvm::sys::path::replace_extension(
+          OutputFile, file_types::getExtension(file_types::TY_SIB));
     }
 
     SerializationOptions serializationOpts;

tools/sil-opt/SILOpt.cpp

@@ -22,6 +22,7 @@
 #include "swift/Basic/LLVMInitialize.h"
 #include "swift/Basic/LLVMContext.h"
 #include "swift/Frontend/DiagnosticVerifier.h"
+#include "swift/Frontend/FileTypes.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/SILOptimizer/Analysis/Analysis.h"
@@ -452,10 +453,12 @@ int main(int argc, char **argv) {
       OutputFile = OutputFilename;
     } else if (ModuleName.size()) {
       OutputFile = ModuleName;
-      llvm::sys::path::replace_extension(OutputFile, SIB_EXTENSION);
+      llvm::sys::path::replace_extension(
+          OutputFile, file_types::getExtension(file_types::TY_SIB));
     } else {
       OutputFile = CI.getMainModule()->getName().str();
-      llvm::sys::path::replace_extension(OutputFile, SIB_EXTENSION);
+      llvm::sys::path::replace_extension(
+          OutputFile, file_types::getExtension(file_types::TY_SIB));
     }
 
     SerializationOptions serializationOpts;