Rename file_types::getTypeTempSuffix to getExtension

Let's be honest: this isn't just for temporary files. Also, it's not
really a "suffix" if it doesn't include the leading dot.

No functionality change.

Author: jrose-apple

include/swift/Frontend/FileTypes.h

@@ -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
@@ -21,7 +21,7 @@
 namespace swift {
 namespace file_types {
 enum ID : uint8_t {
-#define TYPE(NAME, ID, TEMP_SUFFIX, FLAGS) TY_##ID,
+#define TYPE(NAME, ID, EXTENSION, FLAGS) TY_##ID,
 #include "swift/Frontend/Types.def"
 #undef TYPE
   TY_INVALID
@@ -30,9 +30,9 @@ enum ID : uint8_t {
 /// Return the name of the type for \p Id.
 StringRef getTypeName(ID Id);
 
-/// Return the suffix to use when creating a temp file of this type,
-/// or null if unspecified.
-StringRef getTypeTempSuffix(ID Id);
+/// Return the extension to use when creating a file of this type,
+/// or an empty string if unspecified.
+StringRef getExtension(ID Id);
 
 /// Lookup the type to use for the file extension \p Ext.
 /// If the extension is empty or is otherwise not recognized, return

lib/Driver/Driver.cpp

@@ -724,7 +724,7 @@ createStatsReporter(const llvm::opt::InputArgList *ArgList,
   if (Inputs.size() == 1) {
     InputName = Inputs[0].second->getSpelling();
   }
-  StringRef OutputType = file_types::getTypeTempSuffix(OI.CompilerOutputType);
+  StringRef OutputType = file_types::getExtension(OI.CompilerOutputType);
   return llvm::make_unique<UnifiedStatsReporter>("swift-driver",
                                                  OI.ModuleName,
                                                  InputName,
@@ -2054,7 +2054,7 @@ static StringRef assignOutputName(Compilation &C, const JobAction *JA,
   // We should output to a temporary file, since we're not at the top level
   // (or are generating a bridging PCH, which is currently always a temp).
   StringRef Stem = llvm::sys::path::stem(BaseName);
-  StringRef Suffix = file_types::getTypeTempSuffix(JA->getType());
+  StringRef Suffix = file_types::getExtension(JA->getType());
   std::error_code EC = llvm::sys::fs::createTemporaryFile(Stem, Suffix, Buffer);
   if (EC) {
     Diags.diagnose(SourceLoc(), diag::error_unable_to_make_temporary_file,
@@ -2128,7 +2128,7 @@ static StringRef getOutputFilename(Compilation &C,
   if (isa<GenerateDSYMJobAction>(JA)) {
     Buffer = PrimaryInput;
     Buffer.push_back('.');
-    Buffer.append(file_types::getTypeTempSuffix(JA->getType()));
+    Buffer.append(file_types::getExtension(JA->getType()));
     return Buffer.str();
   }
 
@@ -2171,7 +2171,7 @@ static StringRef getOutputFilename(Compilation &C,
     return Buffer.str();
   }
 
-  StringRef Suffix = file_types::getTypeTempSuffix(JA->getType());
+  StringRef Suffix = file_types::getExtension(JA->getType());
   assert(Suffix.data() &&
          "All types used for output should have a suffix.");
 
@@ -2241,7 +2241,7 @@ static void addAuxiliaryOutput(
 
     bool isTempFile = C.isTemporaryFile(path);
     llvm::sys::path::replace_extension(
-        path, file_types::getTypeTempSuffix(outputType));
+        path, file_types::getExtension(outputType));
     output.setAdditionalOutputForType(outputType, path);
     if (isTempFile)
       C.addTemporaryFile(path);
@@ -2264,7 +2264,7 @@ static void addDiagFileOutputForPersistentPCHAction(
   StringRef headerPath = output.getBaseInput(JA->getInputIndex());
   StringRef stem = llvm::sys::path::stem(headerPath);
   StringRef suffix =
-      file_types::getTypeTempSuffix(file_types::TY_SerializedDiagnostics);
+      file_types::getExtension(file_types::TY_SerializedDiagnostics);
   SmallString<256> outPathBuf;
 
   if (const Arg *A = C.getArgs().getLastArg(options::OPT_emit_module_path)) {
@@ -2724,7 +2724,8 @@ void Driver::chooseRemappingOutputPath(Compilation &C,
   } else {
     llvm::SmallString<128> Path(Output->getPrimaryOutputFilenames()[0]);
     bool isTempFile = C.isTemporaryFile(Path);
-    llvm::sys::path::replace_extension(Path, "remap");
+    llvm::sys::path::replace_extension(Path,
+        file_types::getExtension(file_types::ID::TY_Remapping));
     Output->setAdditionalOutputForType(file_types::ID::TY_Remapping, Path);
     if (isTempFile)
       C.addTemporaryFile(Path);

lib/Frontend/Types.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
@@ -22,7 +22,7 @@ using namespace swift::file_types;
 struct TypeInfo {
   const char *Name;
   const char *Flags;
-  const char *TempSuffix;
+  const char *Extension;
 };
 
 static const TypeInfo TypeInfos[] = {
@@ -38,8 +38,8 @@ static const TypeInfo &getInfo(unsigned Id) {
 
 StringRef file_types::getTypeName(ID Id) { return getInfo(Id).Name; }
 
-StringRef file_types::getTypeTempSuffix(ID Id) {
-  return getInfo(Id).TempSuffix;
+StringRef file_types::getExtension(ID Id) {
+  return getInfo(Id).Extension;
 }
 
 ID file_types::lookupTypeForExtension(StringRef Ext) {