]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
analyzer: fix ICE on floating-point bounds [PR111881]
authorDavid Malcolm <dmalcolm@redhat.com>
Tue, 27 Feb 2024 13:36:58 +0000 (08:36 -0500)
committerDavid Malcolm <dmalcolm@redhat.com>
Tue, 27 Feb 2024 13:36:58 +0000 (08:36 -0500)
gcc/analyzer/ChangeLog:
PR analyzer/111881
* constraint-manager.cc (bound::ensure_closed): Assert that
m_constant has integral type.
(range::add_bound): Bail out on floating point constants.

gcc/testsuite/ChangeLog:
PR analyzer/111881
* c-c++-common/analyzer/conditionals-pr111881.c: New test.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>
gcc/analyzer/constraint-manager.cc
gcc/testsuite/c-c++-common/analyzer/conditionals-pr111881.c [new file with mode: 0644]

index e8bcabeb0cd5578b9cf50e7419be37acccb6677d..a380b95315eea136a5f84f7f1ee9ce0b10af7ab8 100644 (file)
@@ -124,10 +124,12 @@ bound::ensure_closed (enum bound_kind bound_kind)
         For example, convert 3 < x into 4 <= x,
         and convert x < 5 into x <= 4.  */
       gcc_assert (CONSTANT_CLASS_P (m_constant));
+      gcc_assert (INTEGRAL_TYPE_P (TREE_TYPE (m_constant)));
       m_constant = fold_build2 (bound_kind == BK_UPPER ? MINUS_EXPR : PLUS_EXPR,
                                TREE_TYPE (m_constant),
                                m_constant, integer_one_node);
       gcc_assert (CONSTANT_CLASS_P (m_constant));
+      gcc_assert (INTEGRAL_TYPE_P (TREE_TYPE (m_constant)));
       m_closed = true;
     }
 }
@@ -306,6 +308,10 @@ range::above_upper_bound (tree rhs_const) const
 bool
 range::add_bound (bound b, enum bound_kind bound_kind)
 {
+  /* Bail out on floating point constants.  */
+  if (!INTEGRAL_TYPE_P (TREE_TYPE (b.m_constant)))
+    return true;
+
   b.ensure_closed (bound_kind);
 
   switch (bound_kind)
diff --git a/gcc/testsuite/c-c++-common/analyzer/conditionals-pr111881.c b/gcc/testsuite/c-c++-common/analyzer/conditionals-pr111881.c
new file mode 100644 (file)
index 0000000..ecf165f
--- /dev/null
@@ -0,0 +1,8 @@
+/* Verify we don't ICE on certain float conditionals.  */
+
+/* { dg-additional-options "-Ofast" } */
+
+int test_pr111881 (float sf1)
+{
+  return sf1 <= 0 || sf1 >= 7 ? 0 : sf1;
+}