Skip to content

Commit 4695214

Browse files
authored
Merge pull request #12195 from DougGregor/importer-no-get-members
[Clang importer] Replace a use of `getMembers()` with a lookup().
2 parents f309630 + a846724 commit 4695214

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

lib/ClangImporter/ImportDecl.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6716,7 +6716,7 @@ void SwiftDeclConverter::importInheritedConstructors(
67166716

67176717
auto curObjCClass = cast<clang::ObjCInterfaceDecl>(classDecl->getClangDecl());
67186718

6719-
auto inheritConstructors = [&](DeclRange members,
6719+
auto inheritConstructors = [&](ArrayRef<ValueDecl *> members,
67206720
Optional<CtorInitializerKind> kind) {
67216721
const auto &languageVersion =
67226722
Impl.SwiftContext.LangOpts.EffectiveLanguageVersion;
@@ -6816,10 +6816,8 @@ void SwiftDeclConverter::importInheritedConstructors(
68166816
// If we have a superclass, import from it.
68176817
if (auto superclassClangDecl = superclass->getClangDecl()) {
68186818
if (isa<clang::ObjCInterfaceDecl>(superclassClangDecl)) {
6819-
inheritConstructors(superclass->getMembers(), kind);
6820-
6821-
for (auto ext : superclass->getExtensions())
6822-
inheritConstructors(ext->getMembers(), kind);
6819+
inheritConstructors(superclass->lookupDirect(Impl.SwiftContext.Id_init),
6820+
kind);
68236821
}
68246822
}
68256823
}

0 commit comments

Comments
 (0)