From 7caa823676410093d15acb8306462c48d7d7119b Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 25 Nov 2015 18:58:11 +0000 Subject: [PATCH] PR c++/67941 * lambda.c (maybe_add_lambda_conv_op): Mark _FUN as no_sanitize_undefined. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230897 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/lambda.c | 6 ++++++ gcc/testsuite/g++.dg/ubsan/null-6.C | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ubsan/null-6.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 968482f3a3e3..635db4e46e92 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2015-11-25 Jason Merrill + PR c++/67941 + * lambda.c (maybe_add_lambda_conv_op): Mark _FUN as + no_sanitize_undefined. + * cp-ubsan.c (cp_ubsan_instrument_vptr_p): Use do_ubsan_in_current_function. diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 5fe34731e4fa..f9b686b16e82 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -1053,6 +1053,12 @@ maybe_add_lambda_conv_op (tree type) if (generic_lambda_p) fn = add_inherited_template_parms (fn, DECL_TI_TEMPLATE (callop)); + /* Don't UBsan this function; we're deliberately calling op() with a null + object argument. */ + tree attrs = build_tree_list (get_identifier ("no_sanitize_undefined"), + NULL_TREE); + cplus_decl_attributes (&fn, attrs, 0); + add_method (type, fn, NULL_TREE); if (nested) diff --git a/gcc/testsuite/g++.dg/ubsan/null-6.C b/gcc/testsuite/g++.dg/ubsan/null-6.C new file mode 100644 index 000000000000..2efe5c2b8cc9 --- /dev/null +++ b/gcc/testsuite/g++.dg/ubsan/null-6.C @@ -0,0 +1,5 @@ +// PR c++/67941 +// { dg-do run { target c++11 } } +// { dg-options -fsanitize=null } + +int main(){ (+[](){})(); } -- 2.47.2