procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

analyzer: fix ICE copying struct [PR 94816]

Browse source 
PR analyzer/94816 reports an ICE when attempting to copy a struct
containing a field for which add_region_for_type for fails (on
an OFFSET_TYPE): the region for the src field comes from
make_region_for_unexpected_tree_code which gives it a NULL type, and
then the copy calls add_region_for_type which unconditionally
dereferences the NULL type.

This patch fixes the ICE by checking for NULL types in
add_region_for_type.

gcc/analyzer/ChangeLog:
	PR analyzer/94816
	* engine.cc (impl_region_model_context::on_unexpected_tree_code):
	Handle NULL tree.
	* region-model.cc (region_model::add_region_for_type): Handle
	NULL type.
	* region-model.h
	(test_region_model_context::on_unexpected_tree_code): Handle NULL
	tree.

gcc/testsuite/ChangeLog:
	PR analyzer/94816
	* g++.dg/analyzer/pr94816.C: New test.
This commit is contained in:
David Malcolm 2020-04-28 10:52:45 -04:00
parent 0e8e1a6d97
commit 5eae0ac76d
6 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gcc/analyzer/ChangeLog
View file

@ -1,3 +1,14 @@
2020-04-28 David Malcolm <dmalcolm@redhat.com>
PR analyzer/94816
* engine.cc (impl_region_model_context::on_unexpected_tree_code):
Handle NULL tree.
* region-model.cc (region_model::add_region_for_type): Handle
NULL type.
* region-model.h
(test_region_model_context::on_unexpected_tree_code): Handle NULL
tree.
2020-04-28 David Malcolm <dmalcolm@redhat.com>
PR analyzer/94447

2
gcc/analyzer/engine.cc
View file

@ -699,7 +699,7 @@ impl_region_model_context::on_unexpected_tree_code (tree t,
logger * const logger = get_logger ();
if (logger)
logger->log ("unhandled tree code: %qs in %qs at %s:%i",
get_tree_code_name (TREE_CODE (t)),
t ? get_tree_code_name (TREE_CODE (t)) : "(null)",
loc.get_impl_location ().m_function,
loc.get_impl_location ().m_file,
loc.get_impl_location ().m_line);

9
gcc/analyzer/region-model.cc
View file

@ -6448,10 +6448,13 @@ region_id
region_model::add_region_for_type (region_id parent_rid, tree type,
region_model_context *ctxt)
{
gcc_assert (TYPE_P (type));
if (type)
{
gcc_assert (TYPE_P (type));
if (region *new_region = make_region_for_type (parent_rid, type))
return add_region (new_region);
if (region *new_region = make_region_for_type (parent_rid, type))
return add_region (new_region);
}
/* If we can't handle TYPE, return a placeholder region, and stop
exploring this path. */

2
gcc/analyzer/region-model.h
View file

@ -2205,7 +2205,7 @@ public:
FINAL OVERRIDE
{
internal_error ("unhandled tree code: %qs",
get_tree_code_name (TREE_CODE (t)));
t ? get_tree_code_name (TREE_CODE (t)) : "(null)");
}
private:

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2020-04-28 David Malcolm <dmalcolm@redhat.com>
PR analyzer/94816
* g++.dg/analyzer/pr94816.C: New test.
2020-04-28 David Malcolm <dmalcolm@redhat.com>
PR analyzer/94447

13
gcc/testsuite/g++.dg/analyzer/pr94816.C Normal file
View file

@ -0,0 +1,13 @@
/* { dg-additional-options "-O" } */
struct jr;
struct ch {
int jr::*rx;
};
ch
ad ()
{
return ch ();
}