Skip to content

Commit 716688c

Browse files
xymusxymus
authored
Merge pull request #33591 from xymus/dont-print-ioi-extensions-5.3
[5.3][ModuleInterface] Don't print extensions to implementation-only imported types
2 parents ae5d4b1 + 20d8192 commit 716688c

15 files changed

+145
-31
lines changed

‎include/swift/AST/FileUnit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ class FileUnit : public DeclContext {
107107
/// Find all SPI names imported from \p importedModule by this module,
108108
/// collecting the identifiers in \p spiGroups.
109109
virtual void lookupImportedSPIGroups(
110-
const ModuleDecl *importedModule,
111-
SmallVectorImpl<Identifier> &spiGroups) const {};
110+
const ModuleDecl *importedModule,
111+
SmallSetVector<Identifier, 4> &spiGroups) const {};
112112

113113
protected:
114114
/// Look up an operator declaration. Do not call directly, use

‎include/swift/AST/Module.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,9 @@ class ModuleDecl : public DeclContext, public TypeDecl {
575575

576576
/// Find all SPI names imported from \p importedModule by this module,
577577
/// collecting the identifiers in \p spiGroups.
578-
void lookupImportedSPIGroups(const ModuleDecl *importedModule,
579-
SmallVectorImpl<Identifier> &spiGroups) const;
578+
void lookupImportedSPIGroups(
579+
const ModuleDecl *importedModule,
580+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const;
580581

581582
/// \sa getImportedModules
582583
enum class ImportFilterKind {
@@ -611,6 +612,12 @@ class ModuleDecl : public DeclContext, public TypeDecl {
611612
void
612613
getImportedModulesForLookup(SmallVectorImpl<ImportedModule> &imports) const;
613614

615+
/// Has \p module been imported via an '@_implementationOnly' import
616+
/// instead of another kind of import?
617+
///
618+
/// This assumes that \p module was imported.
619+
bool isImportedImplementationOnly(const ModuleDecl *module) const;
620+
614621
/// Uniques the items in \p imports, ignoring the source locations of the
615622
/// access paths.
616623
///

‎include/swift/AST/SourceFile.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,9 @@ class SourceFile final : public FileUnit {
365365
/// Find all SPI names imported from \p importedModule by this file,
366366
/// collecting the identifiers in \p spiGroups.
367367
virtual void
368-
lookupImportedSPIGroups(const ModuleDecl *importedModule,
369-
SmallVectorImpl<Identifier> &spiGroups) const override;
368+
lookupImportedSPIGroups(
369+
const ModuleDecl *importedModule,
370+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const override;
370371

371372
// Is \p targetDecl accessible as an explictly imported SPI from this file?
372373
bool isImportedAsSPI(const ValueDecl *targetDecl) const;

‎include/swift/Serialization/SerializedModuleLoader.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,9 @@ class SerializedASTFile final : public LoadedFile {
359359
SmallVectorImpl<AbstractFunctionDecl *> &results) const override;
360360

361361
virtual void
362-
lookupImportedSPIGroups(const ModuleDecl *importedModule,
363-
SmallVectorImpl<Identifier> &spiGroups) const override;
362+
lookupImportedSPIGroups(
363+
const ModuleDecl *importedModule,
364+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const override;
364365

365366
Optional<CommentInfo> getCommentForDecl(const Decl *D) const override;
366367

‎lib/AST/ASTPrinter.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,24 @@ PrintOptions PrintOptions::printSwiftInterfaceFile(bool preferTypeRepr,
168168
if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
169169
if (!shouldPrint(ED->getExtendedNominal(), options))
170170
return false;
171+
172+
// Skip extensions to implementation-only imported types that have
173+
// no public members.
174+
auto localModule = ED->getParentModule();
175+
auto nominalModule = ED->getExtendedNominal()->getParentModule();
176+
if (localModule != nominalModule &&
177+
localModule->isImportedImplementationOnly(nominalModule)) {
178+
179+
bool shouldPrintMembers = llvm::any_of(
180+
ED->getMembers(),
181+
[&](const Decl *member) -> bool {
182+
return shouldPrint(member, options);
183+
});
184+
185+
if (!shouldPrintMembers)
186+
return false;
187+
}
188+
171189
for (const Requirement &req : ED->getGenericRequirements()) {
172190
if (!isPublicOrUsableFromInline(req.getFirstType()))
173191
return false;

‎lib/AST/Module.cpp

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -639,8 +639,9 @@ void ModuleDecl::lookupObjCMethods(
639639
FORWARD(lookupObjCMethods, (selector, results));
640640
}
641641

642-
void ModuleDecl::lookupImportedSPIGroups(const ModuleDecl *importedModule,
643-
SmallVectorImpl<Identifier> &spiGroups) const {
642+
void ModuleDecl::lookupImportedSPIGroups(
643+
const ModuleDecl *importedModule,
644+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
644645
FORWARD(lookupImportedSPIGroups, (importedModule, spiGroups));
645646
}
646647

@@ -2190,31 +2191,50 @@ bool SourceFile::isImportedImplementationOnly(const ModuleDecl *module) const {
21902191
return !imports.isImportedBy(module, getParentModule());
21912192
}
21922193

2193-
void SourceFile::lookupImportedSPIGroups(const ModuleDecl *importedModule,
2194-
SmallVectorImpl<Identifier> &spiGroups) const {
2194+
bool ModuleDecl::isImportedImplementationOnly(const ModuleDecl *module) const {
2195+
auto &imports = getASTContext().getImportCache();
2196+
2197+
// Look through non-implementation-only imports to see if module is imported
2198+
// in some other way. Otherwise we assume it's implementation-only imported.
2199+
ModuleDecl::ImportFilter filter;
2200+
filter |= ModuleDecl::ImportFilterKind::Public;
2201+
filter |= ModuleDecl::ImportFilterKind::Private;
2202+
filter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
2203+
filter |= ModuleDecl::ImportFilterKind::ShadowedBySeparateOverlay;
2204+
SmallVector<ModuleDecl::ImportedModule, 4> results;
2205+
getImportedModules(results, filter);
2206+
2207+
for (auto &desc : results) {
2208+
if (imports.isImportedBy(module, desc.second))
2209+
return false;
2210+
}
2211+
2212+
return true;
2213+
}
2214+
2215+
void SourceFile::lookupImportedSPIGroups(
2216+
const ModuleDecl *importedModule,
2217+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
21952218
for (auto &import : Imports) {
21962219
if (import.importOptions.contains(ImportFlags::SPIAccessControl) &&
21972220
importedModule == std::get<ModuleDecl*>(import.module)) {
21982221
auto importedSpis = import.spiGroups;
2199-
spiGroups.append(importedSpis.begin(), importedSpis.end());
2222+
spiGroups.insert(importedSpis.begin(), importedSpis.end());
22002223
}
22012224
}
22022225
}
22032226

22042227
bool SourceFile::isImportedAsSPI(const ValueDecl *targetDecl) const {
22052228
auto targetModule = targetDecl->getModuleContext();
2206-
SmallVector<Identifier, 4> importedSPIGroups;
2229+
llvm::SmallSetVector<Identifier, 4> importedSPIGroups;
22072230
lookupImportedSPIGroups(targetModule, importedSPIGroups);
22082231
if (importedSPIGroups.empty()) return false;
22092232

22102233
auto declSPIGroups = targetDecl->getSPIGroups();
22112234

2212-
// Note: If we reach a point where there are many SPI imports or SPI groups
2213-
// on decls we could optimize this further by using a set.
2214-
for (auto importedSPI : importedSPIGroups)
2215-
for (auto declSPI : declSPIGroups)
2216-
if (importedSPI == declSPI)
2217-
return true;
2235+
for (auto declSPI : declSPIGroups)
2236+
if (importedSPIGroups.count(declSPI))
2237+
return true;
22182238

22192239
return false;
22202240
}

‎lib/Frontend/ModuleInterfaceSupport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static void printImports(raw_ostream &out,
139139
continue;
140140
}
141141

142-
llvm::SmallVector<Identifier, 4> spis;
142+
llvm::SmallSetVector<Identifier, 4> spis;
143143
M->lookupImportedSPIGroups(importedModule, spis);
144144

145145
// Only print implementation-only imports which have an SPI import.

‎lib/Serialization/ModuleFile.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2665,13 +2665,14 @@ void ModuleFile::lookupObjCMethods(
26652665
}
26662666
}
26672667

2668-
void ModuleFile::lookupImportedSPIGroups(const ModuleDecl *importedModule,
2669-
SmallVectorImpl<Identifier> &spiGroups) const {
2668+
void ModuleFile::lookupImportedSPIGroups(
2669+
const ModuleDecl *importedModule,
2670+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
26702671
for (auto &dep : Dependencies) {
26712672
auto depSpis = dep.spiGroups;
26722673
if (dep.Import.second == importedModule &&
26732674
!depSpis.empty()) {
2674-
spiGroups.append(depSpis.begin(), depSpis.end());
2675+
spiGroups.insert(depSpis.begin(), depSpis.end());
26752676
}
26762677
}
26772678
}

‎lib/Serialization/ModuleFile.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,9 @@ class ModuleFile
816816

817817
/// Find all SPI names imported from \p importedModule by this module,
818818
/// collecting the identifiers in \p spiGroups.
819-
void lookupImportedSPIGroups(const ModuleDecl *importedModule,
820-
SmallVectorImpl<Identifier> &spiGroups) const;
819+
void lookupImportedSPIGroups(
820+
const ModuleDecl *importedModule,
821+
llvm::SmallSetVector<Identifier, 4> &spiGroups) const;
821822

822823
/// Reports all link-time dependencies.
823824
void collectLinkLibraries(ModuleDecl::LinkLibraryCallback callback) const;

‎lib/Serialization/Serialization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ void Serializer::writeInputBlock(const SerializationOptions &options) {
10851085
else
10861086
stableImportControl = ImportControl::ImplementationOnly;
10871087

1088-
SmallVector<Identifier, 4> spis;
1088+
llvm::SmallSetVector<Identifier, 4> spis;
10891089
M->lookupImportedSPIGroups(import.second, spis);
10901090

10911091
ImportedModule.emit(ScratchRecord,

0 commit comments

Comments
 (0)