Always print real module name via printModuleUSR

Author: elsh

include/swift/AST/Module.h

@@ -869,18 +869,18 @@ class ModuleEntity {
   ModuleEntity(const ModuleDecl *Mod) : Mod(Mod) {}
   ModuleEntity(const clang::Module *Mod) : Mod(static_cast<const void *>(Mod)){}
 
-  // @param useRealNameIfAliased Whether to use the module's real name in case
-  //                             module aliasing is used. For example, if a file
-  //                             has `import Foo` and `-module-alias Foo=Bar` is
-  //                             passed, treat Foo as an alias and Bar as the real
-  //                             module name as its dependency. This only applies
-  //                             to Swift modules.
-  // @return The module name; for Swift modules, the real module name could be
-  //         different from the name if module aliasing is used.
+  /// @param useRealNameIfAliased Whether to use the module's real name in case
+  ///                             module aliasing is used. For example, if a file
+  ///                             has `import Foo` and `-module-alias Foo=Bar` is
+  ///                             passed, treat Foo as an alias and Bar as the real
+  ///                             module name as its dependency. This only applies
+  ///                             to Swift modules.
+  /// @return The module name; for Swift modules, the real module name could be
+  ///         different from the name if module aliasing is used.
   StringRef getName(bool useRealNameIfAliased = false) const;
 
-  // For Swift modules, it returns the same result as \c ModuleEntity::getName(bool).
-  // For Clang modules, it returns the result of \c clang::Module::getFullModuleName.
+  /// For Swift modules, it returns the same result as \c ModuleEntity::getName(bool).
+  /// For Clang modules, it returns the result of \c clang::Module::getFullModuleName.
   std::string getFullName(bool useRealNameIfAliased = false) const;
 
   bool isSystemModule() const;

include/swift/AST/USRGeneration.h

@@ -47,14 +47,12 @@ bool printDeclTypeUSR(const ValueDecl *D, raw_ostream &OS);
 bool printValueDeclUSR(const ValueDecl *D, raw_ostream &OS);
 
 /// Prints out the USR for the given ModuleEntity.
-/// \param useRealNameIfAliased Whether to use the module's real name in case
-///                             module aliasing is used. For example, if a file
-///                             has `import Foo` and `-module-alias Foo=Bar` is
-///                             passed, treat Foo as an alias and Bar as the real
-///                             module name as its dependency. This only applies
-///                             to Swift modules.
+/// In case module aliasing is used, it prints the real module name. For example,
+/// if a file has `import Foo` and `-module-alias Foo=Bar` is passed, treat Foo as
+/// an alias and Bar as the real module name as its dependency. Note that the
+/// aliasing only applies to Swift modules.
 /// \returns true if it failed, false on success.
-bool printModuleUSR(ModuleEntity Mod, raw_ostream &OS, bool useRealNameIfAliased = false);
+bool printModuleUSR(ModuleEntity Mod, raw_ostream &OS);
 
 /// Prints out the accessor USR for the given storage Decl.
 /// \returns true if it failed, false on success.

lib/AST/USRGeneration.cpp

@@ -278,9 +278,9 @@ swift::MangleLocalTypeDeclRequest::evaluate(Evaluator &evaluator,
   return NewMangler.mangleLocalTypeDecl(D);
 }
 
-bool ide::printModuleUSR(ModuleEntity Mod, raw_ostream &OS, bool useRealNameIfAliased) {
+bool ide::printModuleUSR(ModuleEntity Mod, raw_ostream &OS) {
   if (auto *D = Mod.getAsSwiftModule()) {
-    StringRef moduleName = useRealNameIfAliased ? D->getRealName().str() : D->getNameStr();
+    StringRef moduleName = D->getRealName().str();
     return clang::index::generateFullUSRForTopLevelModuleName(moduleName, OS);
   } else if (auto ClangM = Mod.getAsClangModule()) {
     return clang::index::generateFullUSRForModule(ClangM, OS);

lib/Index/Index.cpp

@@ -482,7 +482,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
       SmallString<128> storage;
       {
         llvm::raw_svector_ostream OS(storage);
-        if (ide::printModuleUSR(Mod, OS, /*useRealNameIfAliased=*/true))
+        if (ide::printModuleUSR(Mod, OS))
           return true;
         result.USR = stringStorage.copyString(OS.str());
       }