From nobody Sat Apr 25 14:20:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRk37hsz6bZKm for ; Sat, 25 Apr 2026 14:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2sRk02M6z3J9M for ; Sat, 25 Apr 2026 14:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svgNrE5FwLsFQ2d/prQU4j0+Yjv0jCFDrLAfEeh/W4g=; b=Rmp5igU48KcNFYvDROC32fglbSJM2myilSjATw9QrOZzFSIxYJuoK79MdS73dgc4Eyre8D RE0n8w/vTERYfHK8ppksDVEyDi0OF0MDF7VdsXAb1hO7KQVPy8xJEGuc/P3u5ofSNId4kd 3Tspp6JUK+HvAWhnJBTE65MNeYtk2D/jZN9HR95BDdAnnAGsUjUoxDgZYEGjC692o9HZiU hIET35O3bPjAwQwbFhoh0p1OslZ5vCFz4lMLFYL6Xf7nklVKCCUIK4WxSBYfHcm0mkY4Y9 RJHDJRMoq3Y5T6F93bAIhp55Qz09ioO9peF/q+9O0LibyDXUX+75c65H6Ny+tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126818; a=rsa-sha256; cv=none; b=lO15WlZuU2TeDDRjQeXxF632I+rsW9pi5Dh2wPim2GcBUJpQvPzu6J3ALIOZ8CXPT/rg/9 YJgCpdB6HkMQWs2IjfX8mE9y60Mi94oo24S3qCaaoWkSLMHinDMBPqWFYsAMRdrcbw2ooL 4ZHSdSJZ1BvSej35hynr6n/gYhTEX2AP86BNzmyeFC6oDDjPnpNJOAUnQXoVBtqw9EMSFW ouILroCDqM8n1c6S93PVW5YWmCXCZU3U24/h7iY/NKQ0OjUU3GAWLAVWJC9O/J2R2NQ5nC QkhoJdACL1U2PgL2On2yHp85xAe1zyLeVaK7w+Oqxpx28hqPrigaWVI9O4FIWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svgNrE5FwLsFQ2d/prQU4j0+Yjv0jCFDrLAfEeh/W4g=; b=J3ARbeEAKmSMs4GJu9LE+THNWHFAm+5dRbbskkfdvGlZlan/EGhAxKiimU2j9WWYWlzJ7S td5OM94Z4YvqzCFqTLpwb91PHOWqTGDRvPKSNM1Q87wAjWosAlr3rAkY/Zhwc9zkXgoiiG jYLk8mRa0AJ8no1hBBaS5IdNLxfawqG7V17r193jBRXXD+9jeH62ajp5xt17XhjMRSaeLB LWQlzRWr8GbIwBPVKPMLN8sjW5X8oM5qxUyzaO9kj905ur82f35PFMKTEuxtQtLq5QFvkf o4jE9qPeEOrUGjfs3OsFULQukDv/6ea1IREbiNas5CSnMU06h8Ay2l2Hy6KRBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRj6fTyzdG3 for ; Sat, 25 Apr 2026 14:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36aef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1dfe63e4f75f - main - Merge commit d803c61aca0d from llvm git (by Corentin Jabot): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:17 +0000 Message-Id: <69eccda1.36aef.59fbc6c3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db commit 1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db Author: Dimitry Andric AuthorDate: 2026-02-14 20:42:18 +0000 Commit: Dimitry Andric 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(Candidate.Function) && - cast(Candidate.Function) - ->isImplicitObjectMemberFunction() && + !cast(Candidate.Function) + ->isExplicitObjectMemberFunction() && !isa(Candidate.Function); Candidate.ExplicitCallArguments = Args.size();