diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2026-02-14 20:42:18 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2026-05-29 22:57:32 +0000 |
| commit | b53c3c1fb48cea2c45314f2449937e898c1258c1 (patch) | |
| tree | ed1d54d36fc667bf7a8ebf403c8b9c9cb48a25ba | |
| parent | 4f6254a7d79018c414644c63583c3c7f13271d1d (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
(cherry picked from commit 1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db)
| -rw-r--r-- | contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp | 4 |
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(); |