diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ubsan/pr59415.C | 8 | ||||
| -rw-r--r-- | gcc/vtable-verify.c | 4 |
4 files changed, 21 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c262942..c100cee 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-12-09 Marek Polacek <polacek@redhat.com> + + PR sanitizer/59415 + * vtable-verify.c (verify_bb_vtables): Check the return value + of gimple_call_fn. Use is_gimple_call instead of gimple_code. + 2013-12-09 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * config/arm/arm.md (generic_sched): Add cortexa12. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f5adf1a..d8ff9fa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-12-09 Marek Polacek <polacek@redhat.com> + + PR sanitizer/59415 + * g++.dg/ubsan/pr59415.C: New test. + 2013-12-09 Paolo Carlini <paolo.carlini@oracle.com> PR c++/52707 diff --git a/gcc/testsuite/g++.dg/ubsan/pr59415.C b/gcc/testsuite/g++.dg/ubsan/pr59415.C new file mode 100644 index 0000000..4c373f7 --- /dev/null +++ b/gcc/testsuite/g++.dg/ubsan/pr59415.C @@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=null -Wall -fvtable-verify=std" } */ + +void +foo (void) +{ + throw 0; +} diff --git a/gcc/vtable-verify.c b/gcc/vtable-verify.c index b544695..7060189 100644 --- a/gcc/vtable-verify.c +++ b/gcc/vtable-verify.c @@ -586,10 +586,10 @@ verify_bb_vtables (basic_block bb) stmt = gsi_stmt (gsi_virtual_call); /* Count virtual calls. */ - if (gimple_code (stmt) == GIMPLE_CALL) + if (is_gimple_call (stmt)) { tree fncall = gimple_call_fn (stmt); - if (TREE_CODE (fncall) == OBJ_TYPE_REF) + if (fncall && TREE_CODE (fncall) == OBJ_TYPE_REF) total_num_virtual_calls++; } |