aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2026-02-14 20:42:18 +0000
committerDimitry Andric <dim@FreeBSD.org>2026-04-25 14:14:22 +0000
commit1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db (patch)
tree1e9b5498b1aa2f755ce0d457670a704c1b9fbfa6
parent3fd796204fe6aa2e8a2b70bb9ea95f7497247fa3 (diff)
Merge commit d803c61aca0d from llvm git (by Corentin Jabot):
[Clang] Fix a regression introduced by #147046 (#150893) Static functions have an implicit object argument during deduction. This fixes an assertion while compiling the devel/corrade port. PR: 292067 MFC after: 1 month
-rw-r--r--contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp b/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp
index 1b54628c5e56..447d1141e081 100644
--- a/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp
+++ b/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp
@@ -8042,8 +8042,8 @@ static void AddTemplateOverloadCandidateImmediately(
Candidate.IgnoreObjectArgument =
isa<CXXMethodDecl>(Candidate.Function) &&
- cast<CXXMethodDecl>(Candidate.Function)
- ->isImplicitObjectMemberFunction() &&
+ !cast<CXXMethodDecl>(Candidate.Function)
+ ->isExplicitObjectMemberFunction() &&
!isa<CXXConstructorDecl>(Candidate.Function);
Candidate.ExplicitCallArguments = Args.size();