From 3798fa90bcf7be6564fc4368e1881aeefb3211b6 Mon Sep 17 00:00:00 2001 From: Xi Ge Date: Fri, 16 Jun 2023 13:50:25 -0700 Subject: [PATCH] ModuleLoader: minor clean-up to remove dead code. NFC --- lib/Frontend/ModuleInterfaceLoader.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/Frontend/ModuleInterfaceLoader.cpp b/lib/Frontend/ModuleInterfaceLoader.cpp index 290e3bbc5dfe0..917426df5d7ff 100644 --- a/lib/Frontend/ModuleInterfaceLoader.cpp +++ b/lib/Frontend/ModuleInterfaceLoader.cpp @@ -713,15 +713,16 @@ class ModuleInterfaceLoaderImpl { return pathStartsWith(hostPath, path); } - bool isInSystemFrameworks(StringRef path) { + bool isInSystemFrameworks(StringRef path, bool publicFramework) { StringRef sdkPath = ctx.SearchPathOpts.getSDKPath(); if (sdkPath.empty()) return false; - SmallString<128> publicFrameworksPath; - llvm::sys::path::append(publicFrameworksPath, - sdkPath, "System", "Library", "Frameworks"); + SmallString<128> frameworksPath; + llvm::sys::path::append(frameworksPath, + sdkPath, "System", "Library", + publicFramework ? "Frameworks" : "PrivateFrameworks"); - return pathStartsWith(publicFrameworksPath, path); + return pathStartsWith(frameworksPath, path); } std::pair getCompiledModuleCandidates() { @@ -732,11 +733,7 @@ class ModuleInterfaceLoaderImpl { // Don't use the adjacent swiftmodule for frameworks from the public // Frameworks folder of the SDK. - SmallString<128> publicFrameworksPath; - llvm::sys::path::append(publicFrameworksPath, - ctx.SearchPathOpts.getSDKPath(), - "System", "Library", "Frameworks"); - if (isInSystemFrameworks(modulePath)) { + if (isInSystemFrameworks(modulePath, /*publicFramework*/true)) { shouldLoadAdjacentModule = false; rebuildInfo.addIgnoredModule(modulePath, ReasonIgnored::PublicFramework); } else if (isInResourceHostDir(modulePath)) {