diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2020-02-17 17:37:52 -0500 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2020-02-18 08:17:43 -0500 |
| commit | 4f40164a9322105012e9070eebd57ba80c69b873 (patch) | |
| tree | 79427a7450ddd0c840b14ea072e7f7818459067e /gcc/analyzer | |
| parent | 2e6233935c77b56a68e939c629702f960b8e6fb2 (diff) | |
analyzer: fix ICE on failed casts [PR 93777]
PR analyzer/93777 reports ICEs in a Fortran and C++ case involving
a cast of a NULL pointer to a REFERENCE_TYPE.
In both cases the call to build_cast fails and returns a NULL type, but
region_model::maybe_cast_1 asserts that a non-NULL type was returned.
This patch fixes the ICEs by converting the assertion to a conditional.
gcc/analyzer/ChangeLog:
PR analyzer/93777
* region-model.cc (region_model::maybe_cast_1): Replace assertion
that build_cast returns non-NULL with a conditional, falling
through to the logic which returns a new unknown value of the
desired type if it fails.
gcc/testsuite/ChangeLog:
PR analyzer/93777
* g++.dg/analyzer/pr93777.C: New test.
* gfortran.dg/analyzer/pr93777.f90: New test.
Diffstat (limited to 'gcc/analyzer')
| -rw-r--r-- | gcc/analyzer/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/analyzer/region-model.cc | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog index 05fb6144439..f4c620034dd 100644 --- a/gcc/analyzer/ChangeLog +++ b/gcc/analyzer/ChangeLog @@ -1,5 +1,13 @@ 2020-02-18 David Malcolm <dmalcolm@redhat.com> + PR analyzer/93777 + * region-model.cc (region_model::maybe_cast_1): Replace assertion + that build_cast returns non-NULL with a conditional, falling + through to the logic which returns a new unknown value of the + desired type if it fails. + +2020-02-18 David Malcolm <dmalcolm@redhat.com> + PR analyzer/93778 * engine.cc (impl_region_model_context::on_unknown_tree_code): Rename to... diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index c8ee031dc8f..d061552da37 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -5089,10 +5089,9 @@ region_model::maybe_cast_1 (tree dst_type, svalue_id sid) /* Attempt to cast constants. */ if (tree src_cst = sval->maybe_get_constant ()) { - tree dst = build_cast (dst_type, src_cst); - gcc_assert (dst != NULL_TREE); - if (CONSTANT_CLASS_P (dst)) - return get_or_create_constant_svalue (dst); + if (tree dst = build_cast (dst_type, src_cst)) + if (CONSTANT_CLASS_P (dst)) + return get_or_create_constant_svalue (dst); } /* Otherwise, return a new unknown value. */ |