public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/aoliva/heads/testme)] [tree-prof] skip if errors were seen [PR113681]
@ 2024-03-08 16:35 Alexandre Oliva
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Oliva @ 2024-03-08 16:35 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:a2b5748ee9fd2e254ec9bda4bca0d5224e9abd6e

commit a2b5748ee9fd2e254ec9bda4bca0d5224e9abd6e
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Fri Mar 8 12:26:43 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 aed13e2b1bc..d2bdbe3a08c 100644
--- a/gcc/tree-profile.cc
+++ b/gcc/tree-profile.cc
@@ -999,7 +999,8 @@ pass_ipa_tree_profile::gate (function *)
      disabled.  */
   return (!in_lto_p && !flag_auto_profile
 	  && (flag_branch_probabilities || flag_test_coverage
-	      || profile_arc_flag));
+	      || profile_arc_flag)
+	  && !seen_error ());
 }
 
 } // anon namespace

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gcc(refs/users/aoliva/heads/testme)] [tree-prof] skip if errors were seen [PR113681]
@ 2024-05-29  6:59 Alexandre Oliva
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Oliva @ 2024-05-29  6:59 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:1c340408045fdf647edca445e40a75b09bce7493

commit 1c340408045fdf647edca445e40a75b09bce7493
Author: Alexandre Oliva <oliva@adacore.com>
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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-05-29  6:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-08 16:35 [gcc(refs/users/aoliva/heads/testme)] [tree-prof] skip if errors were seen [PR113681] Alexandre Oliva
2024-05-29  6:59 Alexandre Oliva

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).