From nobody Mon Oct 28 17:35:19 2024 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 4XcgWr0tXRz5bZHm; Mon, 28 Oct 2024 17:35:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XcgWr0GQ7z4J3D; Mon, 28 Oct 2024 17:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730136920; 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=ggBEEQplvZtmtfHd/jcST8ZiWI/HyTkj52DQrW5ce1s=; b=KT8EnrsPVZpuBqqpqPkqQ238h7T6rmz53yjIVofxbeNWRs5usorkY9jkij34cp4BJuvTYO m9SbS4QUyH+6tad2NVri+jCEsotJ10jjjUQuzHW1cBK25joH5lgwnNk8V9PkfwaSSBgjnm +xVA4mpbx1uTMZlGCs80m5/cl7BV4eWegKrgyYMCXz7N6PofgHbKG2zIN57DxGrizPYm8Q x9VfmkgjwwtG1QmaI54SCd7RIfivC44QpYsXeN66yVzixS24Soqd+9t4wQtTN/7JT57/XH j8BzmmX8enTKwfovnKFompjufbzYvtT7jQyQdrAcGSL9RIHf5CoWLC3bKloc+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730136920; 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=ggBEEQplvZtmtfHd/jcST8ZiWI/HyTkj52DQrW5ce1s=; b=u94pm7xSeef8KCYOVLoHUwrAkk1leyngYiK1jXss9+2vPuKAamCPzeKI4qB9RfGWgGUKz9 BT5xtQWz3tPVasE/wYTb6pNFXGFTzvPmYCH49D0cWhom+DsHYKiZv9tnun57JJi2UznrJt RujDSM3e2SuOJxHmAO3hopGxOiz1JbP4wxm84vMGLY/tmstBYuf1Ud+XYDdEGbGKJ0XKLY UQ6vD3wg20VgeJcF/zQSKt/cscSAtXT68fsrcOzY5HXiZ9KBFQ2xIETqMLO7Kpg+Hjv+Pb M+zddJSQ8uQOpmdQ3z3R0tVExmDY315pXkLpWlWe7XiBfYQtFEGmpPweArIH3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730136920; a=rsa-sha256; cv=none; b=qpP3wV9A+9NFSg6DmCnmMXvo0N2NufYVcPlBSZrXgfAApbH50hhrSDdtYnBfwZlUQNtWzX Xondr6wOpuzvQw+YrGfaebyrM9XeM9QXsT+YhIOjSD6mYKyAF+m3WkL1ESdEloCy5Iv1qy DYO4jexvUweE9h+Y1L/Fb2LforN2/0lQv0Vx0rgnlQWLnu7PmUw3TIIw6eXecqjwdvYeM/ /duVyH7KReVaH8rz84S9w1Yenimr4gqExctsU13EAsF5CqJr4CKX62WvGCx1TdUbyeLH+b KqHzxwE0/p0rtlGDsI7nY3qCaMEINBge5z4u6h8NGFXiDIEh7I1/fbBiYBcNjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XcgWq6zHrzpFk; Mon, 28 Oct 2024 17:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49SHZJ0Z012792; Mon, 28 Oct 2024 17:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SHZJuL012789; Mon, 28 Oct 2024 17:35:19 GMT (envelope-from git) Date: Mon, 28 Oct 2024 17:35:19 GMT Message-Id: <202410281735.49SHZJuL012789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f3457ed94241 - main - Tentatively merge llvm fix for buildworld WITH_ASAN 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: f3457ed94241be9d4c2c3ab337c9086d5c45c43f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f3457ed94241be9d4c2c3ab337c9086d5c45c43f commit f3457ed94241be9d4c2c3ab337c9086d5c45c43f Author: Dimitry Andric AuthorDate: 2024-10-28 17:33:49 +0000 Commit: Dimitry Andric CommitDate: 2024-10-28 17:34:58 +0000 Tentatively merge llvm fix for buildworld WITH_ASAN Building world using WITH_ASAN results in an assertion when compiling certain source files referencing ifuncs: Assertion failed: (isa(Callee) || isa(Callee)), function analyzeAllUses, file /root/freebsd/contrib/llvm-project/llvm/lib/Analysis/StackSafetyAnalysis.cpp, line 514. This was already reported upstream a while ago, in , but now there is finally a candidate fix, which seems trivial so I am importing it right away. Reported by: markj PR: 280936 Pull Request: https://github.com/llvm/llvm-project/pull/113841 MFC after: 3 days --- contrib/llvm-project/llvm/lib/Analysis/StackSafetyAnalysis.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Analysis/StackSafetyAnalysis.cpp b/contrib/llvm-project/llvm/lib/Analysis/StackSafetyAnalysis.cpp index 27360d0e84cb..5d81658409da 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/StackSafetyAnalysis.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/StackSafetyAnalysis.cpp @@ -528,7 +528,7 @@ void StackSafetyLocalAnalysis::analyzeAllUses(Value *Ptr, // dso_preemptable aliases or aliases with interposable linkage. const GlobalValue *Callee = dyn_cast(CB.getCalledOperand()->stripPointerCasts()); - if (!Callee) { + if (!Callee || isa(Callee)) { US.addRange(I, UnknownRange, /*IsSafe=*/false); break; }