diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/analyzer/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/analyzer/region-model.cc | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/analyzer/pr93777.C | 1 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/analyzer/pr93777.f90 | 22 |
5 files changed, 40 insertions, 4 deletions
diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog index 05fb614..f4c6200 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 c8ee031..d061552 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. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d171d4e..55e2e6e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2020-02-18 David Malcolm <dmalcolm@redhat.com> + PR analyzer/93777 + * g++.dg/analyzer/pr93777.C: New test. + * gfortran.dg/analyzer/pr93777.f90: New test. + +2020-02-18 David Malcolm <dmalcolm@redhat.com> + PR analyzer/93778 * gfortran.dg/analyzer/pr93778.f90: New test. diff --git a/gcc/testsuite/g++.dg/analyzer/pr93777.C b/gcc/testsuite/g++.dg/analyzer/pr93777.C new file mode 100644 index 0000000..e94e75f --- /dev/null +++ b/gcc/testsuite/g++.dg/analyzer/pr93777.C @@ -0,0 +1 @@ +#include "../../g++.old-deja/g++.pt/spec36.C" diff --git a/gcc/testsuite/gfortran.dg/analyzer/pr93777.f90 b/gcc/testsuite/gfortran.dg/analyzer/pr93777.f90 new file mode 100644 index 0000000..1c19835 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/analyzer/pr93777.f90 @@ -0,0 +1,22 @@ +! { dg-additional-options "-O0 -Wno-analyzer-possible-null-dereference -Wno-analyzer-null-dereference -Wno-analyzer-malloc-leak" } + +program cb + implicit none + type :: jn + real, allocatable :: ie + character(len = :), allocatable :: e5 + end type jn + real, parameter :: gm = 5.0 + + block + type(jn) :: r2 + + r2 = jn (gm, "") + call vz (r2%ie, gm) + end block +contains + subroutine vz (arg1, arg2) + real :: arg1, arg2 + if (arg1 .ne. arg2) STOP 1 + end subroutine vz +end program cb |