[NFC] Rename “MagicFileString” -> “FileID”

Doing this NFC renaming first helps clarify the functional changes to come.

# Conflicts:
#	lib/SILGen/SILGenConvert.cpp

Author: beccadax

include/swift/AST/Module.h

@@ -310,7 +310,7 @@ class ModuleDecl : public DeclContext, public TypeDecl {
   /// Note that this returns an empty StringMap if concise \c #file strings are
   /// disabled. Users should fall back to using the file path in this case.
   llvm::StringMap<std::pair<std::string, /*isWinner=*/bool>>
-  computeMagicFileStringMap(bool shouldDiagnose) const;
+  computeFileIDMap(bool shouldDiagnose) const;
 
   /// Add a file declaring a cross-import overlay.
   void addCrossImportOverlayFile(StringRef file);

lib/AST/Module.cpp

@@ -2367,18 +2367,17 @@ getInfoForUsedFileNames(const ModuleDecl *module) {
   return result;
 }
 
-static void
-computeMagicFileString(const ModuleDecl *module, StringRef name,
-                       SmallVectorImpl<char> &result) {
+static void computeFileID(const ModuleDecl *module, StringRef name,
+                          SmallVectorImpl<char> &result) {
   result.assign(module->getNameStr().begin(), module->getNameStr().end());
   result.push_back('/');
   result.append(name.begin(), name.end());
 }
 
 static StringRef
-resolveMagicNameConflicts(const ModuleDecl *module, StringRef fileString,
-                          const llvm::StringMap<SourceFilePathInfo> &paths,
-                          bool shouldDiagnose) {
+resolveFileIDConflicts(const ModuleDecl *module, StringRef fileString,
+                       const llvm::StringMap<SourceFilePathInfo> &paths,
+                       bool shouldDiagnose) {
   assert(paths.size() > 1);
   assert(module->getASTContext().LangOpts.EnableConcisePoundFile);
 
@@ -2437,15 +2436,15 @@ resolveMagicNameConflicts(const ModuleDecl *module, StringRef fileString,
 }
 
 llvm::StringMap<std::pair<std::string, bool>>
-ModuleDecl::computeMagicFileStringMap(bool shouldDiagnose) const {
+ModuleDecl::computeFileIDMap(bool shouldDiagnose) const {
   llvm::StringMap<std::pair<std::string, bool>> result;
   SmallString<64> scratch;
 
   if (!getASTContext().LangOpts.EnableConcisePoundFile)
     return result;
 
   for (auto &namePair : getInfoForUsedFileNames(this)) {
-    computeMagicFileString(this, namePair.first(), scratch);
+    computeFileID(this, namePair.first(), scratch);
     auto &infoForPaths = namePair.second;
 
     assert(!infoForPaths.empty());
@@ -2455,8 +2454,8 @@ ModuleDecl::computeMagicFileStringMap(bool shouldDiagnose) const {
     // will simply warn about conflicts.
     StringRef winner = infoForPaths.begin()->first();
     if (infoForPaths.size() > 1)
-      winner = resolveMagicNameConflicts(this, scratch, infoForPaths,
-                                         shouldDiagnose);
+      winner = resolveFileIDConflicts(this, scratch, infoForPaths,
+                                      shouldDiagnose);
 
     for (auto &pathPair : infoForPaths) {
       result[pathPair.first()] =

lib/SIL/IR/SILPrinter.cpp

@@ -2870,12 +2870,10 @@ printSILCoverageMaps(SILPrintContext &Ctx,
     M->print(Ctx);
 }
 
-using MagicFileStringMap =
-    llvm::StringMap<std::pair<std::string, /*isWinner=*/bool>>;
+using FileIDMap = llvm::StringMap<std::pair<std::string, /*isWinner=*/bool>>;
 
-static void
-printMagicFileStringMapEntry(SILPrintContext &Ctx,
-                             const MagicFileStringMap::MapEntryTy &entry) {
+static void printFileIDMapEntry(SILPrintContext &Ctx,
+                                const FileIDMap::MapEntryTy &entry) {
   auto &OS = Ctx.OS();
   OS << "//   '" << std::get<0>(entry.second)
      << "' => '" << entry.first() << "'";
@@ -2886,8 +2884,7 @@ printMagicFileStringMapEntry(SILPrintContext &Ctx,
   OS << "\n";
 }
 
-static void printMagicFileStringMap(SILPrintContext &Ctx,
-                                    const MagicFileStringMap map) {
+static void printFileIDMap(SILPrintContext &Ctx, const FileIDMap map) {
   if (map.empty())
     return;
 
@@ -2914,10 +2911,10 @@ static void printMagicFileStringMap(SILPrintContext &Ctx,
     });
 
     for (auto key : keys)
-      printMagicFileStringMapEntry(Ctx, *map.find(key));
+      printFileIDMapEntry(Ctx, *map.find(key));
   } else {
     for (const auto &entry : map)
-      printMagicFileStringMapEntry(Ctx, entry);
+      printFileIDMapEntry(Ctx, entry);
   }
 }
 
@@ -3036,8 +3033,8 @@ void SILModule::print(SILPrintContext &PrintCtx, ModuleDecl *M,
   printExternallyVisibleDecls(PrintCtx, externallyVisible.getArrayRef());
 
   if (M)
-    printMagicFileStringMap(
-        PrintCtx, M->computeMagicFileStringMap(/*shouldDiagnose=*/false));
+    printFileIDMap(
+        PrintCtx, M->computeFileIDMap(/*shouldDiagnose=*/false));
 
   OS << "\n\n";
 }

lib/SILGen/SILGen.cpp

@@ -51,8 +51,7 @@ using namespace Lowering;
 
 SILGenModule::SILGenModule(SILModule &M, ModuleDecl *SM)
     : M(M), Types(M.Types), SwiftModule(SM), TopLevelSGF(nullptr),
-      MagicFileStringsByFilePath(
-          SM->computeMagicFileStringMap(/*shouldDiagnose=*/true)) {
+      FileIDsByFilePath(SM->computeFileIDMap(/*shouldDiagnose=*/true)) {
   const SILOptions &Opts = M.getOptions();
   if (!Opts.UseProfile.empty()) {
     auto ReaderOrErr = llvm::IndexedInstrProfReader::create(Opts.UseProfile);

lib/SILGen/SILGen.h

@@ -131,8 +131,7 @@ class LLVM_LIBRARY_VISIBILITY SILGenModule : public ASTVisitor<SILGenModule> {
 
   ASTContext &getASTContext() { return M.getASTContext(); }
 
-  llvm::StringMap<std::pair<std::string, /*isWinner=*/bool>>
-    MagicFileStringsByFilePath;
+  llvm::StringMap<std::pair<std::string, /*isWinner=*/bool>> FileIDsByFilePath;
 
   static DeclName getMagicFunctionName(SILDeclRef ref);
   static DeclName getMagicFunctionName(DeclContext *dc);

lib/SILGen/SILGenApply.cpp

@@ -4611,11 +4611,11 @@ StringRef SILGenFunction::getMagicFilePathString(SourceLoc loc) {
   return getSourceManager().getDisplayNameForLoc(loc);
 }
 
-std::string SILGenFunction::getMagicFileString(SourceLoc loc) {
+std::string SILGenFunction::getMagicFileIDString(SourceLoc loc) {
   auto path = getMagicFilePathString(loc);
 
-  auto result = SGM.MagicFileStringsByFilePath.find(path);
-  if (result != SGM.MagicFileStringsByFilePath.end())
+  auto result = SGM.FileIDsByFilePath.find(path);
+  if (result != SGM.FileIDsByFilePath.end())
     return std::get<0>(result->second);
 
   return path.str();
@@ -4850,7 +4850,7 @@ RValue SILGenFunction::emitLiteral(LiteralExpr *literal, SGFContext C) {
     auto magicLiteral = cast<MagicIdentifierLiteralExpr>(literal);
     switch (magicLiteral->getKind()) {
     case MagicIdentifierLiteralExpr::File: {
-      std::string value = loc.isValid() ? getMagicFileString(loc) : "";
+      std::string value = loc.isValid() ? getMagicFileIDString(loc) : "";
       builtinLiteralArgs = emitStringLiteral(*this, literal, value, C,
                                              magicLiteral->getStringEncoding());
       builtinInit = magicLiteral->getBuiltinInitializer();

lib/SILGen/SILGenConvert.cpp

@@ -144,7 +144,7 @@ auto SILGenFunction::emitSourceLocationArgs(SourceLoc sourceLoc,
   unsigned line = 0;
   unsigned column = 0;
   if (sourceLoc.isValid()) {
-    filename = getMagicFileString(sourceLoc);
+    filename = getMagicFileIDString(sourceLoc);
     std::tie(line, column) = ctx.SourceMgr.getLineAndColumn(sourceLoc);
   }
 

lib/SILGen/SILGenFunction.h

@@ -564,7 +564,7 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   Optional<SILAccessEnforcement> getUnknownEnforcement(VarDecl *var = nullptr);
 
   SourceManager &getSourceManager() { return SGM.M.getASTContext().SourceMgr; }
-  std::string getMagicFileString(SourceLoc loc);
+  std::string getMagicFileIDString(SourceLoc loc);
   StringRef getMagicFilePathString(SourceLoc loc);
   StringRef getMagicFunctionString();