diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2020-02-03 06:34:20 -0500 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2020-02-03 14:23:27 -0500 |
| commit | 287ccd3bd6b92f11ec90c52ffccb764aacfadb89 (patch) | |
| tree | c838e4a5e049a9f481f05e28e2408e8ed1092922 /gcc | |
| parent | e01975f97cbb1a098856687058ba4f64962ee533 (diff) | |
| download | gcc-287ccd3bd6b92f11ec90c52ffccb764aacfadb89.zip gcc-287ccd3bd6b92f11ec90c52ffccb764aacfadb89.tar.gz gcc-287ccd3bd6b92f11ec90c52ffccb764aacfadb89.tar.bz2 | |
analyzer: fix ICE due to comparing int and real constants (PR 93547)
gcc/analyzer/ChangeLog:
PR analyzer/93547
* constraint-manager.cc
(constraint_manager::get_or_add_equiv_class): Ensure types are
compatible before comparing constants.
gcc/testsuite/ChangeLog:
PR analyzer/93547
* gcc.dg/analyzer/pr93547.c: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/analyzer/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/analyzer/constraint-manager.cc | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/analyzer/pr93547.c | 14 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog index 66d46b0..ac6fc1a 100644 --- a/gcc/analyzer/ChangeLog +++ b/gcc/analyzer/ChangeLog @@ -1,3 +1,10 @@ +2020-02-03 David Malcolm <dmalcolm@redhat.com> + + PR analyzer/93547 + * constraint-manager.cc + (constraint_manager::get_or_add_equiv_class): Ensure types are + compatible before comparing constants. + 2020-01-31 David Malcolm <dmalcolm@redhat.com> PR analyzer/93457 diff --git a/gcc/analyzer/constraint-manager.cc b/gcc/analyzer/constraint-manager.cc index f3e31ee..4042c50 100644 --- a/gcc/analyzer/constraint-manager.cc +++ b/gcc/analyzer/constraint-manager.cc @@ -928,7 +928,9 @@ constraint_manager::get_or_add_equiv_class (svalue_id sid) int i; equiv_class *ec; FOR_EACH_VEC_ELT (m_equiv_classes, i, ec) - if (ec->m_constant) + if (ec->m_constant + && types_compatible_p (TREE_TYPE (cst), + TREE_TYPE (ec->m_constant))) { tree eq = fold_build2 (EQ_EXPR, boolean_type_node, cst, ec->m_constant); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cc9f3c1..94e83da 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-02-03 David Malcolm <dmalcolm@redhat.com> + + PR analyzer/93547 + * gcc.dg/analyzer/pr93547.c: New test. + 2020-02-03 Stam Markianos-Wright <stam.markianos-wright@arm.com> PR target/91816 diff --git a/gcc/testsuite/gcc.dg/analyzer/pr93547.c b/gcc/testsuite/gcc.dg/analyzer/pr93547.c new file mode 100644 index 0000000..1518904 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/pr93547.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ + +void +wy (int); + +int +f9 (void) +{ + int p5 = __builtin_ilogb (__builtin_inf ()); + + wy (0); + + return p5; +} |