From fe46e7aa01c52cb5b84902ee52e948028534f4af Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Mon, 9 Dec 2013 14:44:03 +0000 Subject: [PATCH] re PR sanitizer/59415 (ICE segfault in verify_bb_vtables for g++ -S -fvtable-verify=std -fsanitize=null) 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. testsuite/ * g++.dg/ubsan/pr59415.C: New test. From-SVN: r205805 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/ubsan/pr59415.C | 8 ++++++++ gcc/vtable-verify.c | 4 ++-- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ubsan/pr59415.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c2629423697..c100cee94ff 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-12-09 Marek Polacek + + 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 * config/arm/arm.md (generic_sched): Add cortexa12. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f5adf1a5ff4..d8ff9fa08b4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-12-09 Marek Polacek + + PR sanitizer/59415 + * g++.dg/ubsan/pr59415.C: New test. + 2013-12-09 Paolo Carlini 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 00000000000..4c373f7c927 --- /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 b54469517cd..7060189dc7a 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++; } -- 2.30.2