From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id C100A3857C52; Mon, 24 Oct 2022 20:49:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C100A3857C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666644558; bh=WXsubDqfMC1ogEQmeGaoaQPEULYIS7kMQbXBT5yCoEI=; h=From:To:Subject:Date:From; b=tBPvd+fVM5wTUtbQSiN9/l2arL0052atBE2LNmu/AfvM/cCQf7TViAB8zLL2t/30b mhd8skW6VJSvNe4iWhtaFVG1ioK85wXud1XzebvkNtqWAsXQgpbHIYxijsG5nGARLh nTtA9U/KOkYfbXo0nLfDEvtZgePKXlOlYMmprwVM= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Malcolm To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3469] diagnostics: fix ICE in sarif output with NULL filename [PR107366] X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 18faaeb3af42f3d7dc609b9b91df77d0d59b16f6 X-Git-Newrev: 2e8a0553918adc919f98ac5c0224fc6ce1fef68d Message-Id: <20221024204918.C100A3857C52@sourceware.org> Date: Mon, 24 Oct 2022 20:49:18 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2e8a0553918adc919f98ac5c0224fc6ce1fef68d commit r13-3469-g2e8a0553918adc919f98ac5c0224fc6ce1fef68d Author: Martin Liska Date: Mon Oct 24 16:40:00 2022 -0400 diagnostics: fix ICE in sarif output with NULL filename [PR107366] 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 Diff: --- gcc/diagnostic-format-sarif.cc | 2 +- gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) 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; + } + } +} +