[clang] fix crash with ADL for member pointers with dependent class

[mizvekov]

Fix crash when looking up associated namespaces for member pointers with an unknown class, due to dependency.

It was a regression introduced in #131965 and reported here: #132317 (comment)

No change notes since the regression was never released.

[llvmbot]

@llvm/pr-subscribers-clang

Author: Matheus Izvekov (mizvekov)

Changes

Fix crash when looking up associated namespaces for member pointers with an unknown class, due to dependency.

It was a regression introduced in #131965 and reported here: #132317 (comment)

No change notes since the regression was never released.

---

Full diff: https://github.com/llvm/llvm-project/pull/132977.diff

2 Files Affected:

• (modified) clang/lib/Sema/SemaLookup.cpp (+2-2)
• (modified) clang/test/SemaCXX/member-pointer.cpp (+10)

diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index 59dc6df5fbe9f..876340010cf5f 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/lib/Sema/SemaLookup.cpp
@@ -3210,8 +3210,8 @@ addAssociatedClassesAndNamespaces(AssociatedLookup &Result, QualType Ty) {
     //        X.
     case Type::MemberPointer: {
       const MemberPointerType *MemberPtr = cast<MemberPointerType>(T);
-      addAssociatedClassesAndNamespaces(
-          Result, MemberPtr->getMostRecentCXXRecordDecl());
+      if (CXXRecordDecl *Class = MemberPtr->getMostRecentCXXRecordDecl())
+        addAssociatedClassesAndNamespaces(Result, Class);
       T = MemberPtr->getPointeeType().getTypePtr();
       continue;
     }
diff --git a/clang/test/SemaCXX/member-pointer.cpp b/clang/test/SemaCXX/member-pointer.cpp
index 3d9dd05755b8c..fa3e6a5a4bcf7 100644
--- a/clang/test/SemaCXX/member-pointer.cpp
+++ b/clang/test/SemaCXX/member-pointer.cpp
@@ -355,3 +355,13 @@ namespace GH132401 {
   };
   template struct CallableHelper<void (QIODevice::*)()>;
 } // namespace GH132401
+
+namespace adl_dependent_class {
+  struct A {
+    template <class T> A(T);
+  };
+  struct C;
+  template <class T> void d(void (T::*)());
+  void f(A);
+  void g() { f(d<C>); }
+} // namespace adl_dependent_class

[mizvekov]

Since this fixes a regression recently introduced, which was picked up by upstream users,
I will land this as soon as pre-commit checks are done.

[erichkeane]

Change seems reasonable, thanks for the fix!