[gcc(refs/users/aoliva/heads/testme)] set hardcmp eh probs

[gcc(refs/users/aoliva/heads/testme)] set hardcmp eh probs

[Alexandre Oliva]

https://gcc.gnu.org/g:5c5be482ff00ae0dbfb71f6d2ad09930ac44fce8

commit 5c5be482ff00ae0dbfb71f6d2ad09930ac44fce8
Author: Alexandre Oliva <oliva@gnu.org>
Date:   Sat Oct 21 00:30:33 2023 -0300

    set hardcmp eh probs

Diff:
---
 gcc/gimple-harden-conditionals.cc                    | 12 +++++++++++-
 gcc/testsuite/g++.dg/torture/harden-comp-pr111520.cc | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc
index 1999e827a04c..bded28898506 100644
--- a/gcc/gimple-harden-conditionals.cc
+++ b/gcc/gimple-harden-conditionals.cc
@@ -580,11 +580,21 @@ pass_harden_compares::execute (function *fun)
 	  if (throwing_compare_p)
 	    {
 	      add_stmt_to_eh_lp (asgnck, lookup_stmt_eh_lp (asgn));
-	      make_eh_edge (asgnck);
+	      edge eh = make_eh_edge (asgnck);
+	      /* This compare looks like it could raise an exception,
+		 but it's dominated by the original compare, that
+		 would raise an exception first, so the EH edge from
+		 this one is never really taken.  */
+	      eh->probability = profile_probability::never ();
+	      if (eh->dest->count.initialized_p ())
+		eh->dest->count += eh->count ();
+	      else
+		eh->dest->count = eh->count ();
 
 	      edge ckeh;
 	      basic_block nbb = split_edge (non_eh_succ_edge
 					    (gimple_bb (asgnck), &ckeh));
+	      gcc_checking_assert (eh == ckeh);
 	      gsi_split = gsi_start_bb (nbb);
 
 	      if (dump_file)
diff --git a/gcc/testsuite/g++.dg/torture/harden-comp-pr111520.cc b/gcc/testsuite/g++.dg/torture/harden-comp-pr111520.cc
new file mode 100644
index 000000000000..b4381b4d84ec
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/harden-comp-pr111520.cc
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-fharden-compares -fsignaling-nans -fnon-call-exceptions" } */
+
+struct S
+{
+  S (bool);
+  ~S ();
+};
+
+float f;
+
+void
+foo ()
+{
+  S a = 0;
+  S b = f;
+}

[gcc(refs/users/aoliva/heads/testme)] set hardcmp eh probs

[Alexandre Oliva]

https://gcc.gnu.org/g:372f260408cf0149fbd3dd34872cde0a8b48610d

commit 372f260408cf0149fbd3dd34872cde0a8b48610d
Author: Alexandre Oliva <oliva@gnu.org>
Date:   Sat Oct 21 00:30:33 2023 -0300

    set hardcmp eh probs

Diff:
---
 gcc/gimple-harden-conditionals.cc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc
index 1999e827a04c..bded28898506 100644
--- a/gcc/gimple-harden-conditionals.cc
+++ b/gcc/gimple-harden-conditionals.cc
@@ -580,11 +580,21 @@ pass_harden_compares::execute (function *fun)
 	  if (throwing_compare_p)
 	    {
 	      add_stmt_to_eh_lp (asgnck, lookup_stmt_eh_lp (asgn));
-	      make_eh_edge (asgnck);
+	      edge eh = make_eh_edge (asgnck);
+	      /* This compare looks like it could raise an exception,
+		 but it's dominated by the original compare, that
+		 would raise an exception first, so the EH edge from
+		 this one is never really taken.  */
+	      eh->probability = profile_probability::never ();
+	      if (eh->dest->count.initialized_p ())
+		eh->dest->count += eh->count ();
+	      else
+		eh->dest->count = eh->count ();
 
 	      edge ckeh;
 	      basic_block nbb = split_edge (non_eh_succ_edge
 					    (gimple_bb (asgnck), &ckeh));
+	      gcc_checking_assert (eh == ckeh);
 	      gsi_split = gsi_start_bb (nbb);
 
 	      if (dump_file)