diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cp-ubsan.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c94ae5f..968482f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-11-25 Jason Merrill <jason@redhat.com> + + * cp-ubsan.c (cp_ubsan_instrument_vptr_p): Use + do_ubsan_in_current_function. + 2015-11-25 Markus Trippelsdorf <markus@trippelsdorf.de> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c index 0aaf0af..e780c2e 100644 --- a/gcc/cp/cp-ubsan.c +++ b/gcc/cp/cp-ubsan.c @@ -32,9 +32,7 @@ cp_ubsan_instrument_vptr_p (tree type) if (!flag_rtti || flag_sanitize_undefined_trap_on_error) return false; - if (current_function_decl - && lookup_attribute ("no_sanitize_undefined", - DECL_ATTRIBUTES (current_function_decl))) + if (!do_ubsan_in_current_function ()) return false; if (type) |