From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 2E6B73870C09; Wed, 29 May 2024 06:59:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E6B73870C09 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1716965956; bh=OYfKwM19auUO+3lA4+PzCcccza85pC+fmN3aJ8m0o6o=; h=From:To:Subject:Date:From; b=nNgdVFgS+Uc4E8DZZDDqtvujiK7OHiAWMF6drbFGIWT+TqxQqbjTXtjuo899GlFTJ pJsO16zPYs9knRiewHZGw9pRCMi8M+7KHusQFOnJqap62gLPUHgb/N27zH+eGwEo7G V1vBXd/5XF0OCPJF+f7xjFFs6o2HtuU7TocfDOYI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] [tree-prof] skip if errors were seen [PR113681] X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 1b22d42a6624285073f3ef6309af74046fa875e4 X-Git-Newrev: 1c340408045fdf647edca445e40a75b09bce7493 Message-Id: <20240529065916.2E6B73870C09@sourceware.org> Date: Wed, 29 May 2024 06:59:16 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1c340408045fdf647edca445e40a75b09bce7493 commit 1c340408045fdf647edca445e40a75b09bce7493 Author: Alexandre Oliva Date: Wed May 29 02:52:23 2024 -0300 [tree-prof] skip if errors were seen [PR113681] ipa_tree_profile asserts that the symtab is in IPA_SSA state, but we don't reach that state and ICE if e.g. ipa-strub passes report errors. Skip this pass if errors were seen. for gcc/ChangeLog PR tree-optimization/113681 * tree-profiling.cc (pass_ipa_tree_profile::gate): Skip if seen_errors. for gcc/testsuite/ChangeLog PR tree-optimization/113681 * c-c++-common/strub-pr113681.c: New. Diff: --- gcc/testsuite/c-c++-common/strub-pr113681.c | 22 ++++++++++++++++++++++ gcc/tree-profile.cc | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/c-c++-common/strub-pr113681.c b/gcc/testsuite/c-c++-common/strub-pr113681.c new file mode 100644 index 00000000000..3ef9017b2eb --- /dev/null +++ b/gcc/testsuite/c-c++-common/strub-pr113681.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-fstrub=relaxed -fbranch-probabilities" } */ +/* { dg-require-effective-target strub } */ + +/* Same as torture/strub-inlineable1.c, but with -fbranch-probabilities, to + check that IPA tree-profiling won't ICE. It would when we refrained from + running passes that would take it to IPA_SSA, but ran the pass that asserted + for IPA_SSA. */ + +inline void __attribute__ ((strub ("internal"), always_inline)) +inl_int_ali (void) +{ + /* No internal wrapper, so this body ALWAYS gets inlined, + but it cannot be called from non-strub contexts. */ +} + +void +bat (void) +{ + /* Not allowed, not a strub context. */ + inl_int_ali (); /* { dg-error "context" } */ +} diff --git a/gcc/tree-profile.cc b/gcc/tree-profile.cc index b87c121790c..e4bb689cef5 100644 --- a/gcc/tree-profile.cc +++ b/gcc/tree-profile.cc @@ -2070,7 +2070,8 @@ pass_ipa_tree_profile::gate (function *) disabled. */ return (!in_lto_p && !flag_auto_profile && (flag_branch_probabilities || flag_test_coverage - || profile_arc_flag || condition_coverage_flag)); + || profile_arc_flag || condition_coverage_flag) + && !seen_error ()); } } // anon namespace