From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7901) id ECBCA385842A; Tue, 9 Apr 2024 11:49:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ECBCA385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1712663343; bh=2w23YAX7ula2TDdCPA6H5Tg1Wl39nlG8ZFy0f9aXvJE=; h=From:To:Subject:Date:From; b=MGX82wIR4bgW49vkKe7BBaC3IsywJnzX3kG0pkr0i4jBO2MkM4rJwcvP0nR+zexmX 64UEZU19WN7xMqDs9HSAI6ccAygbpY1Zy4+UCicC4mj9K0Xb+ZoX+NnypkFFrxRriM +jvv08VUC/QGqWtgFtG9Tbc1VoeCjdWADBk2ZqvI= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: J?rgen Kvalsvik To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-9870] Guard function->cond_uids access [PR114601] X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?J=C3=B8rgen_Kvalsvik?= X-Git-Refname: refs/heads/master X-Git-Oldrev: a79d13a01f8cbb99fb45bf3f3ffc62c99ee0b05e X-Git-Newrev: dd78e6a3cbd8f7c678d90ca0d05787faeb2e9c9a Message-Id: <20240409114903.ECBCA385842A@sourceware.org> Date: Tue, 9 Apr 2024 11:49:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dd78e6a3cbd8f7c678d90ca0d05787faeb2e9c9a commit r14-9870-gdd78e6a3cbd8f7c678d90ca0d05787faeb2e9c9a Author: Jørgen Kvalsvik Date: Tue Apr 9 13:39:03 2024 +0200 Guard function->cond_uids access [PR114601] PR114601 shows that it is possible to reach the condition_uid lookup without having also created the fn->cond_uids, through compiler-generated conditionals. Consider all lookups on non-existing maps misses, which they are from the perspective of the source code, to avoid the NULL access. PR gcov-profile/114601 gcc/ChangeLog: * tree-profile.cc (condition_uid): Guard fn->cond_uids access. gcc/testsuite/ChangeLog: * gcc.misc-tests/gcov-pr114601.c: New test. Diff: --- gcc/testsuite/gcc.misc-tests/gcov-pr114601.c | 11 +++++++++++ gcc/tree-profile.cc | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gcc.misc-tests/gcov-pr114601.c b/gcc/testsuite/gcc.misc-tests/gcov-pr114601.c new file mode 100644 index 00000000000..72248c8fd25 --- /dev/null +++ b/gcc/testsuite/gcc.misc-tests/gcov-pr114601.c @@ -0,0 +1,11 @@ +/* PR gcov-profile/114601 */ +/* { dg-do compile } */ +/* { dg-options "-fcondition-coverage -finstrument-functions-once" } */ + +/* -finstrument-functions-once inserts a hidden conditional expression into + this function which otherwise has none. This caused a crash on looking up + the condition as the cond->expr map is not created unless it necessary. */ +void +empty (void) +{ +} diff --git a/gcc/tree-profile.cc b/gcc/tree-profile.cc index b85111624fe..b87c121790c 100644 --- a/gcc/tree-profile.cc +++ b/gcc/tree-profile.cc @@ -359,12 +359,17 @@ condition_index (unsigned flag) min-max, etc., which leaves ghost identifiers in basic blocks that do not end with a conditional jump. They are not really meaningful for condition coverage anymore, but since coverage is unreliable under optimization anyway - this is not a big problem. */ + this is not a big problem. + + The cond_uids map in FN cannot be expected to exist. It will only be + created if it is needed, and a function may have gconds even though there + are none in source. This can be seen in PR gcov-profile/114601, when + -finstrument-functions-once is used and the function has no conditions. */ unsigned condition_uid (struct function *fn, basic_block b) { gimple *stmt = gsi_stmt (gsi_last_bb (b)); - if (!safe_is_a (stmt)) + if (!safe_is_a (stmt) || !fn->cond_uids) return 0; unsigned *v = fn->cond_uids->get (as_a (stmt));