From nobody Thu Oct 01 12:32:00 2026 X-Original-To: dev-commits-src-main@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 4hwWWP1GxBz6tl15 for ; Thu, 01 Oct 2026 12:32:01 +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 4hwWWN6vB5z3CQY for ; Thu, 01 Oct 2026 12:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790857921; 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=yh+mDTa7yXeyGsF968KJE1bLcGf03YFnBO5/Ge6t65M=; b=rMyO6W/py08iNfIbsckndZO8+WYfnAy4QetvqyRffChS3R5EFcWnfAddZwc1hD2KXt0HA+ 69TUlfnnLqa96eERs2rRNgRTDDGunMx1spT83DNh4Zm3+m/X5hVbe/ktLJxYDhBE6UEKCS KH+I76FuvRpyCuDL0+8jFfwVHlCvRLDXziUouVflxaB1AMBbt360EoF3kPo2IscBbvGbok ncf195py/1K8zqX9V9REWILln/PmlHEjYm34p2GW1cMcn9aSwAS8Ht/EwaG6awmFszTiid GxPeTnyo010BgjpSQDh9/Nn4xGhY0vXCAaEIhhDH0BzxYdrUb4ey1YVpc8srAA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790857921; b=JNwrqjqxwsN0U0mZzS+wdNQSEOsHWR4rt8N1cTuWxcpGsXa6/pxeaAGjKe1G4zH7GsAx/I anroIZp1e7kzCR38Fjj/8brVZ4QtZK5hy17TpbJ5WZps1CVtudzAcfSCedbdOLQBloNU8F 6VfCqUBzu50Zzl6V4zbGiLQJT3p4qvPniwwRJyS5gYqRDToWDgVpgtnho4KDYj7D75XVMX mqglkXNfxpOo72x6IA6ar/LsHOR74KJDzzOhGbWaPaRhLy3TOX+klFL0ID5/Zc7Og5nbvS kr9uss4mmKKZ5VZBUbBmqeCxR71nT0dzS/KEHn6cZColJOav6BsbLvn6nJPnLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790857921; 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=yh+mDTa7yXeyGsF968KJE1bLcGf03YFnBO5/Ge6t65M=; b=KmwIAagrGjPkx0Jh76F0D8dxEzuHjn3vf/tE5gi1upltkJBSSWUpraR5N7Mg+1PfSSDKTl VwP0HXINwQ9BPO3iiKM+Dfw8P0j/5+8xCeYHXqlulm3lPaNQCVYuPD7O9UrbRkYbGKa0rt +EPewZ/DKShRyFo4egHDxWXQ+mEXGfqU6GrAQBDY29shnGsMyz72lJsesFR1JuW25RjfsT Fyo+jcNDmWU+eXxpeD0ZLU/Lj3HhT9YawqABSEf5vRqN/DO72lJijDDyL5QFJ4jWzL9Oqj g9WRJTD8ljpPs6AKfe0ibctiVuOEBJ9dl6WRYipZfHjeYwzfIkcmRZlAe/7JPA== 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 4hwWWN5WFGzWNw for ; Thu, 01 Oct 2026 12:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21fc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 12:32:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 37c9eba1644b - main - Merge commit 80e8c0a59189 from llvm-project (by ShengYi Hung): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 37c9eba1644b0f9e1b5d130ccff381122f48aebe Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 12:32:00 +0000 Message-Id: <6abe52c0.21fc7.2c62007f@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=37c9eba1644b0f9e1b5d130ccff381122f48aebe commit 37c9eba1644b0f9e1b5d130ccff381122f48aebe Author: Dimitry Andric AuthorDate: 2026-10-01 12:31:42 +0000 Commit: Dimitry Andric CommitDate: 2026-10-01 12:31:42 +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 --- 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(