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 branch 'main' into allowable-serialization

Browse Source
This commit is contained in:
Xi Ge
2022-11-28 09:36:04 -08:00
committed by GitHub
parent c3db946517 527d9a85d2
commit 5987654b3a
344 changed files with 1696 additions and 1648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Frontend/ModuleInterfaceBuilder.cpp
View File

@@ -124,8 +124,8 @@ bool ExplicitModuleInterfaceBuilder::collectDepsForSerialization(
// Serialize the paths of dependencies in the SDK relative to it.
Optional<StringRef> SDKRelativePath = getRelativeDepPath(DepName, SDKPath);
StringRef DepNameToStore = SDKRelativePath.getValueOr(DepName);
bool IsSDKRelative = SDKRelativePath.hasValue();
StringRef DepNameToStore = SDKRelativePath.value_or(DepName);
bool IsSDKRelative = SDKRelativePath.has_value();
// Forwarding modules add the underlying prebuilt module to their
// dependency list -- don't serialize that.