From nobody Tue Oct 06 16:38:29 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 4hzhlV0zztz4n9dy for ; Tue, 06 Oct 2026 16:38:30 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzhlV0QBmz4mVW for ; Tue, 06 Oct 2026 16:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304710; 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=BBuRffBSN4wmBjteHG0HocO5j7HLwtvBk28/gqaaC0Q=; b=sRAevXLpRUXRGRel09gXxYI60uZgR3elYsdDfNk4vyCdH9V9ItKYkWwn9xsRzqRUS0FVeS uOm+Bx+zk6jMLug4QFtcdvi3hDuN6/sAj9/qmK7S7gNtSSwZRwrps4k6P9ud6PJ/uIFVZG qwykJFRiAQzkQpeWtcDhVdUh8WgF6iLvmGi5+Wb9rzwGzNLGmh+YV+rKSliIEtr9X4U7u0 ZVv1nQyDv+CAYXKv1izQGVfXmK3iylIe+IWsPkp8JS2Ds6aWsdGaAJxGf0d5b1+OQE/MAX C1dZRB0K7Cqq9MWfbu8/HkZsILOVu4rmH9Z1zYje48mfvfmCDv1Sr6GsgR8toQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791304710; b=No5TtFZsnt09rEU2IHcpadgz9lz4sFZzk37H1fGOdO8rbdQpFPFkEAQwSWG6/pi9ICcpsh wQieiO/cGHoJdVMkmEv5/pUpRynWo2U+//s19/HpcWAfHu9Rxpy+UHoqxUixZ0/FwlowwC ivVOXUuG4PBKHWLcfE3oqOY0z4HbN6zNVwEKnfl/CXI6YlTU0F9KF7jdrD3TR0nDQL4/H9 MJoxm9NDkgQWJ4l8C7Jwm/aOSusN4lIYvmTxnuNJO6yCcZQvNMJuD/eXOooihoIIs0PYwi cc6GSM9gaEkgJ7dnu9S+JLO9q2zDys+IpB4u0Wg7AygBzebb7lpSulNnFxVMjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304710; 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=BBuRffBSN4wmBjteHG0HocO5j7HLwtvBk28/gqaaC0Q=; b=jLcLkm67/ZKfVZibKn6RNBnWD18VdB9xB9NyRBHJYW5fNmykRZhWstnDNGVbQU0LTH3aCy Q4SXL4WPjXW21R1C1RIX+jsyRfXlJOf9cUUJA/qMA4eit+Ggktgk/Kz1mIpe68N4Ky5RKy YKgZMmNvKOLbJUptKw80Gy0LvzaUF+rZGsAOVwOlI7EjkLkJu9GG/7YLv1J7RgEociF1Pu YO2w4+TzGH8Lk4e9nVbRTnZ5m3VoKrpShq/SS0IaY0PXsbpsNUrb1jmljNB05nQYDqAIgN f3HcxBi2ue6lhuvPgiaWUm2rFJYs+Ok0wAy7t6J5uPyeMnt0+TZEpAyrBweYAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzhlT6c9yz1C9W for ; Tue, 06 Oct 2026 16:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30155 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 16:38:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: afc8c5f9fd73 - stable/15 - Merge commit 80e8c0a59189 from llvm-project (by ShengYi Hung): 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: afc8c5f9fd73badc16d8312d86ecfd88ad01be01 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 16:38:29 +0000 Message-Id: <6ac52405.30155.57f9b8ea@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=afc8c5f9fd73badc16d8312d86ecfd88ad01be01 commit afc8c5f9fd73badc16d8312d86ecfd88ad01be01 Author: Dimitry Andric AuthorDate: 2026-10-01 12:31:42 +0000 Commit: Dimitry Andric CommitDate: 2026-10-06 16:34:13 +0000 Merge commit 80e8c0a59189 from llvm-project (by ShengYi Hung): [DebugInfo] Fill Column 0 if Line is not found (#227559) It is possible that user specified line 0 as the start of the line in C language (using `# 0`). However, it is rejected by the Lexer as we have no line but still carries column information. As a result, we fill column to 0 if we cannot find line. Assisted-by: Claude # Test Fixes: #56186 This fixes a fatal error when building the textproc/peg port. PR: 264853 MFC after: 3 days (cherry picked from commit 37c9eba1644b0f9e1b5d130ccff381122f48aebe) --- contrib/llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp b/contrib/llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp index ec28bd259e8e..42e38bfc2872 100644 --- a/contrib/llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/contrib/llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp @@ -4868,9 +4868,12 @@ void CGDebugInfo::CreateLexicalBlock(SourceLocation Loc) { llvm::MDNode *Back = nullptr; if (!LexicalBlockStack.empty()) Back = LexicalBlockStack.back().get(); + // A #line 0 macro carried no line information but still take column + // information. This will finally be rejected by the lexer but is legal. + unsigned Line = getLineNumber(CurLoc); + unsigned Column = Line ? getColumnNumber(CurLoc) : 0; LexicalBlockStack.emplace_back(DBuilder.createLexicalBlock( - cast(Back), getOrCreateFile(CurLoc), getLineNumber(CurLoc), - getColumnNumber(CurLoc))); + cast(Back), getOrCreateFile(CurLoc), Line, Column)); } void CGDebugInfo::AppendAddressSpaceXDeref(