diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ubsan/pr65019.C | 24 | ||||
| -rw-r--r-- | gcc/ubsan.c | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 723c62e..60af263 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2015-02-12 Jakub Jelinek <jakub@redhat.com> + PR sanitizer/65019 + * ubsan.c (ubsan_expand_objsize_ifn): Always return true. + PR tree-optimization/65014 * fold-const.c (fold_binary_loc): When creating {L,R}ROTATE_EXPR, use original second operand of arg0 or arg1 instead of diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dfd7230..01127e9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2015-02-12 Jakub Jelinek <jakub@redhat.com> + PR sanitizer/65019 + * g++.dg/ubsan/pr65019.C: New test. + PR tree-optimization/65014 * gcc.c-torture/compile/pr65014.c: New test. diff --git a/gcc/testsuite/g++.dg/ubsan/pr65019.C b/gcc/testsuite/g++.dg/ubsan/pr65019.C new file mode 100644 index 0000000..a7f21a7 --- /dev/null +++ b/gcc/testsuite/g++.dg/ubsan/pr65019.C @@ -0,0 +1,24 @@ +// PR sanitizer/65019 +// { dg-do compile } +// { dg-options "-fsanitize=alignment,object-size,vptr -std=c++11 -O2 -fcompare-debug" } + +struct A { }; +struct B { }; +struct C final { + C (const A &, int); + static B *foo (const A &, int = 1); + virtual ~C (); + void *c; +}; + +B * +C::foo (const A &x, int y) +{ + C *d = new C (x, y); + if (d->c == nullptr) + delete d; +} + +C::~C () +{ +} diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 2c1030c..fc3352f 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -987,7 +987,7 @@ ubsan_expand_objsize_ifn (gimple_stmt_iterator *gsi) /* Get rid of the UBSAN_OBJECT_SIZE call from the IR. */ unlink_stmt_vdef (stmt); gsi_remove (&gsi_orig, true); - return gsi_end_p (*gsi); + return true; } /* Cached __ubsan_vptr_type_cache decl. */ |