Merge pull request #27171 from davidungar/memberCount-fix

[NameLookup ASTScope] Ensure memberCount includes unparsed members

Author: David Ungar

include/swift/AST/DeclContext.h

@@ -760,7 +760,7 @@ class IterableDeclContext {
   void addMember(Decl *member, Decl *hint = nullptr);
 
   /// See \c MemberCount
-  unsigned getMemberCount() const { return MemberCount; }
+  unsigned getMemberCount() const;
 
   /// Check whether there are lazily-loaded members.
   bool hasLazyMembers() const {

lib/AST/DeclContext.cpp

@@ -807,6 +807,12 @@ bool IterableDeclContext::hasUnparsedMembers() const {
   return true;
 }
 
+unsigned IterableDeclContext::getMemberCount() const {
+  if (hasUnparsedMembers())
+    loadAllMembers();
+  return MemberCount;
+}
+
 void IterableDeclContext::loadAllMembers() const {
   ASTContext &ctx = getASTContext();