[NFC] Add ASTContext::getModuleByIdentifier()

This is a reasonably common operation.

Author: beccadax

include/swift/AST/ASTContext.h

@@ -879,6 +879,8 @@ class ASTContext final {
 
   ModuleDecl *getModuleByName(StringRef ModuleName);
 
+  ModuleDecl *getModuleByIdentifier(Identifier ModuleID);
+
   /// Returns the standard library module, or null if the library isn't present.
   ///
   /// If \p loadIfAbsent is true, the ASTContext will attempt to load the module

lib/AST/ASTContext.cpp

@@ -1921,15 +1921,18 @@ ModuleDecl *ASTContext::getModuleByName(StringRef ModuleName) {
   return getModule(builder.get());
 }
 
+ModuleDecl *ASTContext::getModuleByIdentifier(Identifier ModuleID) {
+  ImportPath::Module::Builder builder(ModuleID);
+  return getModule(builder.get());
+}
+
 ModuleDecl *ASTContext::getStdlibModule(bool loadIfAbsent) {
   if (TheStdlibModule)
     return TheStdlibModule;
 
   if (loadIfAbsent) {
     auto mutableThis = const_cast<ASTContext*>(this);
-    TheStdlibModule =
-      mutableThis->getModule(
-                           ImportPath::Module::Builder(StdlibModuleName).get());
+    TheStdlibModule = mutableThis->getModuleByIdentifier(StdlibModuleName);
   } else {
     TheStdlibModule = getLoadedModule(StdlibModuleName);
   }

lib/ClangImporter/ClangImporter.cpp

@@ -3414,8 +3414,7 @@ ModuleDecl *ClangModuleUnit::getOverlayModule() const {
     // FIXME: Include proper source location.
     ModuleDecl *M = getParentModule();
     ASTContext &Ctx = M->getASTContext();
-    auto overlay = Ctx.getModule(
-                       ImportPath::Module::Builder(M->getName()).get());
+    auto overlay = Ctx.getModuleByIdentifier(M->getName());
     if (overlay == M) {
       overlay = nullptr;
     } else {

lib/ClangImporter/ImportType.cpp

@@ -2441,7 +2441,7 @@ static ModuleDecl *tryLoadModule(ASTContext &C,
   if (importForwardDeclarations)
     module = C.getLoadedModule(moduleName);
   else
-    module = C.getModule(ImportPath::Module::Builder(moduleName).get());
+    module = C.getModuleByIdentifier(moduleName);
 
   checkedModules[moduleName] = module;
   return module;

lib/Sema/ImportResolution.cpp

@@ -447,8 +447,7 @@ ModuleImplicitImportsRequest::evaluate(Evaluator &evaluator,
 
   // Add any modules we were asked to implicitly import.
   for (auto moduleName : importInfo.ModuleNames) {
-    auto *importModule = ctx.getModule(
-        ImportPath::Module::Builder(moduleName).get());
+    auto *importModule = ctx.getModuleByIdentifier(moduleName);
     if (!importModule) {
       ctx.Diags.diagnose(SourceLoc(), diag::sema_no_import, moduleName.str());
       if (ctx.SearchPathOpts.SDKPath.empty() &&

tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

@@ -40,10 +40,6 @@ using namespace SourceKit;
 using namespace swift;
 using namespace ide;
 
-static ModuleDecl *getModuleByFullName(ASTContext &Ctx, Identifier ModuleName) {
-  return Ctx.getModule(ImportPath::Module::Builder(ModuleName).get());
-}
-
 namespace {
 struct TextRange {
   unsigned Offset;
@@ -1012,7 +1008,7 @@ static void reportSourceAnnotations(const SourceTextInfo &IFaceInfo,
 static bool getModuleInterfaceInfo(ASTContext &Ctx, StringRef ModuleName,
                                    SourceTextInfo &Info) {
   // Load standard library so that Clang importer can use it.
-  auto *Stdlib = getModuleByFullName(Ctx, Ctx.StdlibModuleName);
+  auto *Stdlib = Ctx.getModuleByIdentifier(Ctx.StdlibModuleName);
   if (!Stdlib)
     return true;
 
@@ -1539,7 +1535,7 @@ findModuleGroups(StringRef ModuleName, ArrayRef<const char *> Args,
 
   // Load standard library so that Clang importer can use it.
   ASTContext &Ctx = CI.getASTContext();
-  auto *Stdlib = getModuleByFullName(Ctx, Ctx.StdlibModuleName);
+  auto *Stdlib = Ctx.getModuleByIdentifier(Ctx.StdlibModuleName);
   if (!Stdlib) {
     Error = "Cannot load stdlib.";
     Receiver(RequestResult<ArrayRef<StringRef>>::fromError(Error));

tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp

@@ -91,10 +91,6 @@ typedef SwiftInterfaceGenContext::Implementation::TextReference TextReference;
 typedef SwiftInterfaceGenContext::Implementation::TextDecl TextDecl;
 typedef SwiftInterfaceGenContext::Implementation::SourceTextInfo SourceTextInfo;
 
-static ModuleDecl *getModuleByFullName(ASTContext &Ctx, Identifier ModuleName) {
-  return Ctx.getModule(ImportPath::Module::Builder(ModuleName).get());
-}
-
 namespace {
 class AnnotatingPrinter : public StreamPrinter {
   SourceTextInfo &Info;
@@ -383,7 +379,7 @@ SwiftInterfaceGenContext::create(StringRef DocumentName,
   CloseClangModuleFiles scopedCloseFiles(*Ctx.getClangModuleLoader());
 
   // Load standard library so that Clang importer can use it.
-  auto *Stdlib = getModuleByFullName(Ctx, Ctx.StdlibModuleName);
+  auto *Stdlib = Ctx.getModuleByIdentifier(Ctx.StdlibModuleName);
   if (!Stdlib) {
     ErrMsg = "Could not load the stdlib module";
     return nullptr;
@@ -443,7 +439,7 @@ SwiftInterfaceGenContext::createForTypeInterface(CompilerInvocation Invocation,
   CloseClangModuleFiles scopedCloseFiles(*Ctx.getClangModuleLoader());
 
   // Load standard library so that Clang importer can use it.
-  auto *Stdlib = getModuleByFullName(Ctx, Ctx.StdlibModuleName);
+  auto *Stdlib = Ctx.getModuleByIdentifier(Ctx.StdlibModuleName);
   if (!Stdlib) {
     ErrorMsg = "Could not load the stdlib module";
     return nullptr;

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -214,8 +214,7 @@ static void indexModule(llvm::MemoryBuffer *Input,
   std::unique_ptr<ImplicitSerializedModuleLoader> Loader;
   ModuleDecl *Mod = nullptr;
   if (ModuleName == Ctx.StdlibModuleName.str()) {
-    Mod = Ctx.getModule(ImportPath::Module::Builder(Ctx.StdlibModuleName)
-                          .get());
+    Mod = Ctx.getModuleByIdentifier(Ctx.StdlibModuleName);
   } else {
     Loader = ImplicitSerializedModuleLoader::create(Ctx);
     auto Buf = std::unique_ptr<llvm::MemoryBuffer>(

tools/swift-ide-test/swift-ide-test.cpp

@@ -2118,8 +2118,7 @@ static ModuleDecl *getModuleByFullName(ASTContext &Context, StringRef ModuleName
 }
 
 static ModuleDecl *getModuleByFullName(ASTContext &Context, Identifier ModuleName) {
-  ModuleDecl *Result = Context.getModule(
-                             ImportPath::Module::Builder(ModuleName).get());
+  ModuleDecl *Result = Context.getModuleByIdentifier(ModuleName);
   if (!Result || Result->failedToLoad())
     return nullptr;
   return Result;