[PATCH 1/2] analyzer: further fixes for comparisons between uncomparable types (PR 93450)

[David Malcolm]

gcc/analyzer/ChangeLog:
        PR analyzer/93450
        * constraint-manager.cc
        (constraint_manager::get_or_add_equiv_class): Only compare constants
        if their types are compatible.
        * region-model.cc (constant_svalue::eval_condition): Replace check
        for identical types with call to types_compatible_p.
---
 gcc/analyzer/constraint-manager.cc | 4 +++-
 gcc/analyzer/region-model.cc       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/analyzer/constraint-manager.cc 
b/gcc/analyzer/constraint-manager.cc
index 777bd1b13c9..f3e31ee0830 100644
--- a/gcc/analyzer/constraint-manager.cc
+++ b/gcc/analyzer/constraint-manager.cc
@@ -958,7 +958,9 @@ constraint_manager::get_or_add_equiv_class (svalue_id sid)
           other_id.m_idx++)
        {
          const equiv_class &other_ec = other_id.get_obj (*this);
-         if (other_ec.m_constant)
+         if (other_ec.m_constant
+             && types_compatible_p (TREE_TYPE (new_ec->m_constant),
+                                    TREE_TYPE (other_ec.m_constant)))
            {
              /* If we have two ECs, both with constants, the constants must be
                 non-equal (or they would be in the same EC).
diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc
index a15088a2e3c..b546114bfd5 100644
--- a/gcc/analyzer/region-model.cc
+++ b/gcc/analyzer/region-model.cc
@@ -667,7 +667,7 @@ constant_svalue::eval_condition (constant_svalue *lhs,
   gcc_assert (CONSTANT_CLASS_P (rhs_const));
 
   /* Check for comparable types.  */
-  if (TREE_TYPE (lhs_const) == TREE_TYPE (rhs_const))
+  if (types_compatible_p (TREE_TYPE (lhs_const), TREE_TYPE (rhs_const)))
     {
       tree comparison
        = fold_build2 (op, boolean_type_node, lhs_const, rhs_const);
-- 
2.21.0