Add support for #fileID

This temporarily breaks -enable-experimental-concise-pound-file.

fixup adding #fileID

# Conflicts:
#	lib/SILGen/SILGenConvert.cpp

Author: beccadax

include/swift/AST/DiagnosticsCommon.def

@@ -114,11 +114,11 @@ ERROR(sdk_node_unrecognized_decl_kind,none,
 ERROR(sdk_node_unrecognized_accessor_kind,none,
       "unrecognized accessor kind '%0' in SDK node", (StringRef))
 
-// Emitted from ModuleDecl::computeMagicFileStringMap()
-WARNING(pound_source_location_creates_pound_file_conflicts,none,
-        "'#sourceLocation' directive produces '#file' string of '%0', which "
-        "conflicts with '#file' strings produced by other paths in the module",
-        (StringRef))
+// Emitted from ModuleDecl::computeFileIDMap()
+WARNING(source_location_creates_file_id_conflicts,none,
+        "'#sourceLocation' directive produces '#fileID' string of '%0', which "
+        "conflicts with '#fileID' strings produced by other paths in the "
+        "module", (StringRef))
 NOTE(fixit_correct_source_location_file,none,
      "change file in '#sourceLocation' to '%0'", (StringRef))
 

include/swift/AST/MagicIdentifierKinds.def

@@ -57,6 +57,10 @@ MAGIC_STRING_IDENTIFIER(File, "#file", PoundFileExpr)
   MAGIC_IDENTIFIER_TOKEN(File, pound_file)
   MAGIC_IDENTIFIER_DEPRECATED_TOKEN(File, kw___FILE__)
 
+/// The \c #fileID magic identifier literal.
+MAGIC_STRING_IDENTIFIER(FileID, "#fileID", PoundFileIDExpr)
+  MAGIC_IDENTIFIER_TOKEN(FileID, pound_fileID)
+
 /// The \c #filePath magic identifier literal.
 MAGIC_STRING_IDENTIFIER(FilePath, "#filePath", PoundFilePathExpr)
   MAGIC_IDENTIFIER_TOKEN(FilePath, pound_filePath)

include/swift/AST/Module.h

@@ -294,21 +294,18 @@ class ModuleDecl : public DeclContext, public TypeDecl {
   void addFile(FileUnit &newFile);
   void removeFile(FileUnit &existingFile);
 
-  /// Creates a map from \c #filePath strings to corresponding \c #file
+  /// Creates a map from \c #filePath strings to corresponding \c #fileID
   /// strings, diagnosing any conflicts.
   ///
-  /// A given \c #filePath string always maps to exactly one \c #file string,
+  /// A given \c #filePath string always maps to exactly one \c #fileID string,
   /// but it is possible for \c #sourceLocation directives to introduce
   /// duplicates in the opposite direction. If there are such conflicts, this
   /// method will diagnose the conflict and choose a "winner" among the paths
-  /// in a reproducible way. The \c bool paired with the \c #file string is
+  /// in a reproducible way. The \c bool paired with the \c #fileID string is
   /// \c true for paths which did not have a conflict or won a conflict, and
   /// \c false for paths which lost a conflict. Thus, if you want to generate a
-  /// reverse mapping, you should drop or special-case the \c #file strings that
-  /// are paired with \c false.
-  ///
-  /// 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.
+  /// reverse mapping, you should drop or special-case the \c #fileID strings
+  /// that are paired with \c false.
   llvm::StringMap<std::pair<std::string, /*isWinner=*/bool>>
   computeFileIDMap(bool shouldDiagnose) const;
 

lib/AST/Module.cpp

@@ -2379,7 +2379,6 @@ resolveFileIDConflicts(const ModuleDecl *module, StringRef fileString,
                        const llvm::StringMap<SourceFilePathInfo> &paths,
                        bool shouldDiagnose) {
   assert(paths.size() > 1);
-  assert(module->getASTContext().LangOpts.EnableConcisePoundFile);
 
   /// The path we consider to be "correct"; we will emit fix-its changing the
   /// other paths to match this one.
@@ -2429,7 +2428,7 @@ resolveFileIDConflicts(const ModuleDecl *module, StringRef fileString,
 
     for (auto loc : pathPair.second.virtualFileLocs) {
       diags.diagnose(loc,
-                     diag::pound_source_location_creates_pound_file_conflicts,
+                     diag::source_location_creates_file_id_conflicts,
                      fileString);
 
       // Offer a fix-it unless it would be tautological.
@@ -2447,18 +2446,15 @@ 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)) {
     computeFileID(this, namePair.first(), scratch);
     auto &infoForPaths = namePair.second;
 
     assert(!infoForPaths.empty());
 
     // TODO: In the future, we'd like to handle these conflicts gracefully by
-    // generating a unique `#file` string for each conflicting name. For now, we
-    // will simply warn about conflicts.
+    // generating a unique `#fileID` string for each conflicting name. For now,
+    // we will simply warn about conflicts.
     StringRef winner = infoForPaths.begin()->first();
     if (infoForPaths.size() > 1)
       winner = resolveFileIDConflicts(this, scratch, infoForPaths,

lib/SIL/IR/SILPrinter.cpp

@@ -2888,7 +2888,7 @@ static void printFileIDMap(SILPrintContext &Ctx, const FileIDMap map) {
   if (map.empty())
     return;
 
-  Ctx.OS() << "\n\n// Mappings from '#file' to '#filePath':\n";
+  Ctx.OS() << "\n\n// Mappings from '#fileID' to '#filePath':\n";
 
   if (Ctx.sortSIL()) {
     llvm::SmallVector<llvm::StringRef, 16> keys;

lib/SILGen/SILGenApply.cpp

@@ -4849,7 +4849,7 @@ RValue SILGenFunction::emitLiteral(LiteralExpr *literal, SGFContext C) {
 
     auto magicLiteral = cast<MagicIdentifierLiteralExpr>(literal);
     switch (magicLiteral->getKind()) {
-    case MagicIdentifierLiteralExpr::File: {
+    case MagicIdentifierLiteralExpr::FileID: {
       std::string value = loc.isValid() ? getMagicFileIDString(loc) : "";
       builtinLiteralArgs = emitStringLiteral(*this, literal, value, C,
                                              magicLiteral->getStringEncoding());
@@ -4858,6 +4858,7 @@ RValue SILGenFunction::emitLiteral(LiteralExpr *literal, SGFContext C) {
       break;
     }
 
+    case MagicIdentifierLiteralExpr::File:
     case MagicIdentifierLiteralExpr::FilePath: {
       StringRef value = loc.isValid() ? getMagicFilePathString(loc) : "";
       builtinLiteralArgs = emitStringLiteral(*this, literal, value, C,

lib/SILGen/SILGenConvert.cpp

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

lib/Serialization/Deserialization.cpp

@@ -219,6 +219,7 @@ getActualDefaultArgKind(uint8_t raw) {
   CASE(Inherited)
   CASE(Column)
   CASE(File)
+  CASE(FileID)
   CASE(FilePath)
   CASE(Line)
   CASE(Function)

lib/Serialization/ModuleFormat.h

@@ -460,6 +460,7 @@ enum class DefaultArgumentKind : uint8_t {
   None = 0,
   Normal,
   File,
+  FileID,
   FilePath,
   Line,
   Column,

lib/Serialization/Serialization.cpp

@@ -1120,6 +1120,7 @@ static uint8_t getRawStableDefaultArgumentKind(swift::DefaultArgumentKind kind)
   CASE(Inherited)
   CASE(Column)
   CASE(File)
+  CASE(FileID)
   CASE(FilePath)
   CASE(Line)
   CASE(Function)