git: 1dfe63e4f75f - main - Merge commit d803c61aca0d from llvm git (by Corentin Jabot):

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db

commit 1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2026-02-14 20:42:18 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-04-25 14:14:22 +0000

    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
---
 contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp | 4 ++--
 1 file 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();