From patchwork Mon Oct 24 20:54:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 10278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp647866wru; Mon, 24 Oct 2022 13:55:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6HQYabd2JE63KTCYW7TvL1vJv+mVZqU7pguTKy7BrCtal1/nAj8uRn0vWc1gdyTSfoUt+v X-Received: by 2002:a05:6402:5cb:b0:452:e416:2bc4 with SMTP id n11-20020a05640205cb00b00452e4162bc4mr31986319edx.114.1666644941174; Mon, 24 Oct 2022 13:55:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666644941; cv=none; d=google.com; s=arc-20160816; b=Nz8QTx0zSQXIebqvmIi05BbNghA7KC1T+x2bhUJgrIPpmciJBebVSjfN+SNy9trKaM 79u8DTEi8EbjKD3YYDfRj7oA4b1osyYTWYyFY8U73nVaze1jvS7Ye/aOKiwoIVwNR74U g6gRw8/2f8NzB5PuEwXsFE7Bk0E4nMadb67USGktHbZnaXysxEvNv8sjhvJY4tCVsqaH nbG++n+ZydaYNhOFKuKmrCeHCOs2lWjr+BEXXREBNLM9GV4bLDvH1FIrUdlFIHxlyNoy 91lrwd3SQFxBtXVg5VZViMyy7t2F/xi00VQr294PRW08/gaRVCzmG6dgIhzAaJWGsExI qzcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=8wEyL5F4R0/Wxx+aTHFPs3yMq3u1k/TLpQnygjkqS00=; b=ZYBU3ki28fuCi/4vBw3a2gLW23cUras3zvJPHeFCdUqMc4oW8U/cZOODEeT5Lvg2FM 3zjI82FUQgq1M6/HqZuPc8rR/Iti0Mod1xtlVd2ufaSFkPj9s8ziZBT3AJ2LQ51F13it zJbWJJLag9D90lQ0c3HiuBz/+rTu/Izp9i9et6QYhQXpTMriX9TVDlhk1+KZo5NnSYmy nFvWCmOdiNpVag2Yw0qsAhq+fiqVAfSzjnMa+/JRP4BUBg7Y7AioPucJayA0yttsI6Ja Zs3dJ8H81nWOPmu9dbtA+YM3daIofwdWsOPqVh8anFZeThAsK73MAYsQ/JSX/XZmRecg EcYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="j8tOnz2/"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a70-20020a509ecc000000b00461bff75d84si695536edf.463.2022.10.24.13.55.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 13:55:41 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="j8tOnz2/"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 21B033858421 for ; Mon, 24 Oct 2022 20:55:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21B033858421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666644940; bh=8wEyL5F4R0/Wxx+aTHFPs3yMq3u1k/TLpQnygjkqS00=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=j8tOnz2/o+Vd7L4ncZdoksSqm1jpV/dNTd1C2d8fQgbOQC1MM1bKWeGaJsSciU2go hBy2o8eW8Mp7VwqIhvqs9vPjXXq5092Scn1uoISlVCHZfe3GVEmkDjPwFooYMzfjyi Z71zQqgqBlnzvrl6gym5jOcvKxkgz7nzV1EXwn6g= 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 ESMTPS id D9EBD3858023 for ; Mon, 24 Oct 2022 20:54:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9EBD3858023 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-461-u-6I1hcWMIKsZbwsrjyrog-1; Mon, 24 Oct 2022 16:54:55 -0400 X-MC-Unique: u-6I1hcWMIKsZbwsrjyrog-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D87C180280D for ; Mon, 24 Oct 2022 20:54:54 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3069C15BB2; Mon, 24 Oct 2022 20:54:54 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [committed] diagnostics: fix ICE in sarif output with NULL filename [PR107366] Date: Mon, 24 Oct 2022 16:54:53 -0400 Message-Id: <20221024205453.1760357-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 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_MSPIKE_H2, SPF_HELO_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747603885512722037?= X-GMAIL-MSGID: =?utf-8?q?1747603885512722037?= Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-3469-g2e8a0553918adc. gcc/ChangeLog: PR analyzer/107366 * diagnostic-format-sarif.cc (sarif_builder::maybe_make_physical_location_object): Gracefully reject locations with NULL filename. gcc/testsuite/ChangeLog: PR analyzer/107366 * gcc.dg/analyzer/sarif-pr107366.c: New test. Signed-off-by: David Malcolm --- gcc/diagnostic-format-sarif.cc | 2 +- .../gcc.dg/analyzer/sarif-pr107366.c | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc index fc28d160c38..7110db4edd6 100644 --- a/gcc/diagnostic-format-sarif.cc +++ b/gcc/diagnostic-format-sarif.cc @@ -595,7 +595,7 @@ sarif_builder::make_location_object (const diagnostic_event &event) json::object * sarif_builder::maybe_make_physical_location_object (location_t loc) { - if (loc <= BUILTINS_LOCATION) + if (loc <= BUILTINS_LOCATION || LOCATION_FILE (loc) == NULL) return NULL; json::object *phys_loc_obj = new json::object (); diff --git a/gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c b/gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c new file mode 100644 index 00000000000..997cf56586d --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fdiagnostics-format=sarif-file" } */ + +typedef enum { + HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO +} hwloc_topology_diff_obj_attr_type_t; +enum { HWLOC_TOPOLOGY_DIFF_OBJ_ATTR } hwloc_apply_diff_one_diff_0_0; + +void +hwloc_apply_diff_one() { + switch (hwloc_apply_diff_one_diff_0_0) + case HWLOC_TOPOLOGY_DIFF_OBJ_ATTR: { + hwloc_topology_diff_obj_attr_type_t obj_attr_2_0_0; + switch (obj_attr_2_0_0) + case HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO: { + unsigned ii = 0; + } + } +} +