From patchwork Fri Sep 12 14:52:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 120158 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 93D663857C5D for ; Fri, 12 Sep 2025 14:57:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93D663857C5D Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cqx/EbM7 X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 539AC3857B8F for ; Fri, 12 Sep 2025 14:52:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 539AC3857B8F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 539AC3857B8F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757688740; cv=none; b=lBRitokciV256VocSN5P+YT0uqkUbScmbxDqcSe2hvRYpBKBck1Y+tPwohF5HwzgKylRtJFY8N9IPklTNddAf5X5OhrgeKEnJLqs/dgwrfmUEid/+PKhQIigh+iDyWDKItEpExVTN+SqBjtjWp97LgQHby9zApzee2Zy60fv4WQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757688740; c=relaxed/simple; bh=lmDaQf0uPYpydTLXoCZSzAMJzovM8gttJbLFRlt8Jbo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vdWh9StVcEvFcZpiYlKBvwe/OgcV6ERtVDQBEcFZ2DsiESqm4+BPi75e61c28Qqi/33ijs9eNGSO1g6evG0LylEfdBbQUkzuqU0EKfSYfkkvQqrJm8uRXwguxbF+dNzbqd2wgCIdkdfOQKfidSyEQwUc3p4bE/ot6bxyHEe4Vww= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 539AC3857B8F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757688740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=28fSntxqa8CL7bxXgpPe6TJbJNhvnaVOJXzWuqoKr/c=; b=cqx/EbM7qHBtyPDbOpwO/2cZL07vG0UqIwsluCj6Ek+2QJm9CUYmXgE8FW37toIyAgSFqV VhvtR8hxvvSLtesEZfqvQrAh01cafabUhknv3IHs86mSfM2wnESJe4KkMOeVEO6f3lgJk5 LZgDYa3b0MxMCenlm6kE1Z7r0nuEPuU= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-WFDmLVITPpuCW8sjmhXDHQ-1; Fri, 12 Sep 2025 10:52:18 -0400 X-MC-Unique: WFDmLVITPpuCW8sjmhXDHQ-1 X-Mimecast-MFC-AGG-ID: WFDmLVITPpuCW8sjmhXDHQ_1757688738 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DB571800372 for ; Fri, 12 Sep 2025 14:52:18 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.82.104]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5A58718003FC; Fri, 12 Sep 2025 14:52:17 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed: r16-3828] diagnostics: handle fatal_error in SARIF output [PR120063] Date: Fri, 12 Sep 2025 10:52:16 -0400 Message-ID: <20250912145216.1836121-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: o_xYVgHC4DlMV_oIpR6I6yr055CUnKk87U716VcwoV8_1757688738 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_W, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r16-3828-g259347de43e965. gcc/ChangeLog: PR diagnostics/120063 * diagnostics/context.cc (context::execution_failed_p): Also treat any kind::fatal errors as leading to failed execution. * diagnostics/sarif-sink.cc (maybe_get_sarif_level): Handle kind::fatal as SARIF level "error". gcc/testsuite/ChangeLog: PR diagnostics/120063 * gcc.dg/fatal-error.c: New test. * gcc.dg/fatal-error-html.py: New test. * gcc.dg/fatal-error-sarif.py: New test. --- gcc/diagnostics/context.cc | 5 ++-- gcc/diagnostics/sarif-sink.cc | 1 + gcc/testsuite/gcc.dg/fatal-error-html.py | 28 ++++++++++++++++++++++ gcc/testsuite/gcc.dg/fatal-error-sarif.py | 29 +++++++++++++++++++++++ gcc/testsuite/gcc.dg/fatal-error.c | 11 +++++++++ 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/fatal-error-html.py create mode 100644 gcc/testsuite/gcc.dg/fatal-error-sarif.py create mode 100644 gcc/testsuite/gcc.dg/fatal-error.c diff --git a/gcc/diagnostics/context.cc b/gcc/diagnostics/context.cc index 0f8670ba806e..139c022a6027 100644 --- a/gcc/diagnostics/context.cc +++ b/gcc/diagnostics/context.cc @@ -463,9 +463,8 @@ context::dump (FILE *outfile, int indent) const bool context::execution_failed_p () const { - /* Equivalent to (seen_error () || werrorcount), but on - this context, rather than global_dc. */ - return (diagnostic_count (kind::error) + return (diagnostic_count (kind::fatal) + || diagnostic_count (kind::error) || diagnostic_count (kind::sorry) || diagnostic_count (kind::werror)); } diff --git a/gcc/diagnostics/sarif-sink.cc b/gcc/diagnostics/sarif-sink.cc index c85a35e4f631..bc121388bb87 100644 --- a/gcc/diagnostics/sarif-sink.cc +++ b/gcc/diagnostics/sarif-sink.cc @@ -1980,6 +1980,7 @@ maybe_get_sarif_level (enum kind diag_kind) { case kind::warning: return "warning"; + case kind::fatal: case kind::error: return "error"; case kind::note: diff --git a/gcc/testsuite/gcc.dg/fatal-error-html.py b/gcc/testsuite/gcc.dg/fatal-error-html.py new file mode 100644 index 000000000000..b7e7a680ce86 --- /dev/null +++ b/gcc/testsuite/gcc.dg/fatal-error-html.py @@ -0,0 +1,28 @@ +from htmltest import * + +import pytest + +@pytest.fixture(scope='function', autouse=True) +def html_tree(): + return html_tree_from_env() + +def test_results(html_tree): + root = html_tree.getroot () + assert root.tag == make_tag('html') + + head = root.find('xhtml:head', ns) + assert head is not None + + body = root.find('xhtml:body', ns) + assert body is not None + + diag_list = body.find("./xhtml:div[@class='gcc-diagnostic-list']", ns) + assert len(diag_list) + + diag = diag_list.find('xhtml:div[@id="gcc-diag-0"]', ns) + assert diag is not None + message = diag.find("./xhtml:div[@class='gcc-message']", ns) + assert message is not None + assert message[0].tag == make_tag('strong') + assert message[0].text == 'fatal error: ' + assert message[0].tail.startswith(' this-does-not-exist.h:') diff --git a/gcc/testsuite/gcc.dg/fatal-error-sarif.py b/gcc/testsuite/gcc.dg/fatal-error-sarif.py new file mode 100644 index 000000000000..4c434ed8dcf1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/fatal-error-sarif.py @@ -0,0 +1,29 @@ +from sarif import * + +import pytest + +@pytest.fixture(scope='function', autouse=True) +def sarif(): + return sarif_from_env() + +def test_execution_unsuccessful(sarif): + runs = sarif['runs'] + run = runs[0] + + invocations = run['invocations'] + assert len(invocations) == 1 + invocation = invocations[0] + + # We expect the fatal error to make executionSuccessful be false + assert invocation['executionSuccessful'] == False + +def test_fatal_error(sarif): + runs = sarif['runs'] + run = runs[0] + results = run['results'] + + assert len(results) == 1 + + result = results[0] + assert result['level'] == 'error' + assert result['message']['text'] == "this-does-not-exist.h: No such file or directory" diff --git a/gcc/testsuite/gcc.dg/fatal-error.c b/gcc/testsuite/gcc.dg/fatal-error.c new file mode 100644 index 000000000000..54f90079d9f3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/fatal-error.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fdiagnostics-add-output=sarif" } */ +/* { dg-additional-options "-fdiagnostics-add-output=experimental-html:javascript=no" } */ + +#include "this-does-not-exist.h" + +/* { dg-prune-output "fatal error:" } + { dg-prune-output "compilation terminated" } + { dg-final { verify-sarif-file } } + { dg-final { run-sarif-pytest fatal-error.c "fatal-error-sarif.py" } } + { dg-final { run-html-pytest fatal-error.c "fatal-error-html.py" } } */