From 43ad6ce60108acc822efcd394b75e270c1996cb5 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 27 Feb 2024 08:36:58 -0500 Subject: [PATCH] analyzer: fix ICE on floating-point bounds [PR111881] 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 --- gcc/analyzer/constraint-manager.cc | 6 ++++++ .../c-c++-common/analyzer/conditionals-pr111881.c | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/c-c++-common/analyzer/conditionals-pr111881.c diff --git a/gcc/analyzer/constraint-manager.cc b/gcc/analyzer/constraint-manager.cc index e8bcabeb0cd..a380b95315e 100644 --- a/gcc/analyzer/constraint-manager.cc +++ b/gcc/analyzer/constraint-manager.cc @@ -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 index 00000000000..ecf165feeec --- /dev/null +++ b/gcc/testsuite/c-c++-common/analyzer/conditionals-pr111881.c @@ -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; +}