Force the entire member table for superclasses

Note that this can be an optimization in many cases since we only have
to scrounge around in the PCMs once.

Author: CodaFi

lib/ClangImporter/ClangImporter.cpp

@@ -3714,22 +3714,19 @@ void ClangImporter::Implementation::lookupAllObjCMembers(
   }
 }
 
-// Force the named member of the entire inheritance hierarchy to be loaded and
+// Force the members of the entire inheritance hierarchy to be loaded and
 // deserialized before loading the named member of this class. This allows the
 // decl members table to be warmed up and enables the correct identification of
 // overrides.
-static void loadNamedMemberOfSuperclassIfNeeded(const ClassDecl *CD,
-                                                  DeclBaseName name) {
+static void ensureSuperclassMembersAreLoaded(const ClassDecl *CD) {
   if (!CD)
     return;
 
   CD = CD->getSuperclassDecl();
   if (!CD || !CD->hasClangNode())
     return;
 
-  auto ci = CD->getASTContext().getOrCreateLazyIterableContextData(
-      CD, /*lazyLoader=*/nullptr);
-  ci->loader->loadNamedMembers(CD, name, ci->memberData);
+  CD->loadAllMembers();
 }
 
 Optional<TinyPtrVector<ValueDecl *>>
@@ -3793,7 +3790,7 @@ ClangImporter::Implementation::loadNamedMembers(
 
   assert(isa<clang::ObjCContainerDecl>(CD) || isa<clang::NamespaceDecl>(CD));
 
-  loadNamedMemberOfSuperclassIfNeeded(dyn_cast<ClassDecl>(D), N);
+  ensureSuperclassMembersAreLoaded(dyn_cast<ClassDecl>(D));
 
   TinyPtrVector<ValueDecl *> Members;
   for (auto entry : table->lookup(SerializedSwiftName(N),

test/NameBinding/named_lazy_member_loading_objc_interface.swift

@@ -8,7 +8,7 @@
 // Check that named-lazy-member-loading reduces the number of Decls deserialized
 // RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -disable-named-lazy-member-loading -stats-output-dir %t/stats-pre -primary-file %s %S/Inputs/NamedLazyMembers/NamedLazyMembersExt.swift
 // RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-post -primary-file %s %S/Inputs/NamedLazyMembers/NamedLazyMembersExt.swift
-// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
+// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities <= -1' %t/stats-pre %t/stats-post
 
 import NamedLazyMembers