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
2023-09-29 20:19:54 -07:00
parent 8a91c622c0 e820854784
commit 2e9555437f
24 changed files with 400 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/ImportResolution.cpp
View File

@@ -570,7 +570,7 @@ UnboundImport::UnboundImport(ImportDecl *ID)
import.accessLevel = ID->getAccessLevel();
if (auto attr = ID->getAttrs().getAttribute<AccessControlAttr>()) {
import.accessLevelLoc = attr->getLocation();
import.accessLevelRange = attr->getLocation();
}
if (ID->getAttrs().hasAttribute<SPIOnlyAttr>())
@@ -822,9 +822,9 @@ void UnboundImport::validateResilience(NullablePtr<ModuleDecl> topLevelModule,
SF.getParentModule()->getName());
if (ctx.LangOpts.hasFeature(Feature::AccessLevelOnImport)) {
SourceLoc attrLoc = import.accessLevelLoc;
if (attrLoc.isValid())
inFlight.fixItReplace(attrLoc, "internal");
SourceRange attrRange = import.accessLevelRange;
if (attrRange.isValid())
inFlight.fixItReplace(attrRange, "internal");
else
inFlight.fixItInsert(import.importLoc, "internal ");
} else {