diff options
| -rw-r--r-- | gcc/analyzer/region-model.cc | 19 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/analyzer/pr101143.c | 18 |
2 files changed, 33 insertions, 4 deletions
diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 462fe6d8b3c..ee11e82bdf2 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -1443,6 +1443,17 @@ assert_compat_types (tree src_type, tree dst_type) } } +/* Return true if SRC_TYPE can be converted to DST_TYPE as a no-op. */ + +static bool +compat_types_p (tree src_type, tree dst_type) +{ + if (src_type && dst_type && !VOID_TYPE_P (dst_type)) + if (!(useless_type_conversion_p (src_type, dst_type))) + return false; + return true; +} + /* Get the region for PV within this region_model, emitting any diagnostics to CTXT. */ @@ -3402,8 +3413,8 @@ const region * region_model::create_region_for_heap_alloc (const svalue *size_in_bytes) { const region *reg = m_mgr->create_region_for_heap_alloc (); - assert_compat_types (size_in_bytes->get_type (), size_type_node); - set_dynamic_extents (reg, size_in_bytes); + if (compat_types_p (size_in_bytes->get_type (), size_type_node)) + set_dynamic_extents (reg, size_in_bytes); return reg; } @@ -3414,8 +3425,8 @@ const region * region_model::create_region_for_alloca (const svalue *size_in_bytes) { const region *reg = m_mgr->create_region_for_alloca (m_current_frame); - assert_compat_types (size_in_bytes->get_type (), size_type_node); - set_dynamic_extents (reg, size_in_bytes); + if (compat_types_p (size_in_bytes->get_type (), size_type_node)) + set_dynamic_extents (reg, size_in_bytes); return reg; } diff --git a/gcc/testsuite/gcc.dg/analyzer/pr101143.c b/gcc/testsuite/gcc.dg/analyzer/pr101143.c new file mode 100644 index 00000000000..bcc0974d4e3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/pr101143.c @@ -0,0 +1,18 @@ +/* { dg-additional-options "-Wno-builtin-declaration-mismatch" } */ + +extern void *malloc (unsigned int); +extern void *alloca (unsigned int); +extern void unknown_fn (void *); + +void * +test_malloc (void) +{ + return malloc (sizeof (int)); +} + +void * +test_alloca (void) +{ + void *p = alloca (sizeof (int)); + unknown_fn (p); +} |