averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2024-07-03 18:14:58 -07:00
parent f0044fcfca 15dda6c9a7
commit f40f3be8a8
9 changed files with 134 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -1786,6 +1786,19 @@ bool ModuleFileSharedCore::hasSourceInfo() const {
return !!DeclUSRsTable;
}
std::string ModuleFileSharedCore::resolveModuleDefiningFilePath(const StringRef SDKPath) const {
if (!ModuleInterfacePath.empty()) {
std::string interfacePath = ModuleInterfacePath.str();
if (llvm::sys::path::is_relative(interfacePath)) {
SmallString<128> absoluteInterfacePath(SDKPath);
llvm::sys::path::append(absoluteInterfacePath, interfacePath);
return absoluteInterfacePath.str().str();
} else
return interfacePath;
} else
return ModuleInputBuffer->getBufferIdentifier().str();
}
ModuleLoadingBehavior
ModuleFileSharedCore::getTransitiveLoadingBehavior(
const Dependency &dependency,