]> git.ipfire.org Git - thirdparty/gcc.git/commit
opts.c (common_handle_option): Handle -fsanitize=alignment.
authorJakub Jelinek <jakub@redhat.com>
Fri, 1 Aug 2014 07:52:43 +0000 (09:52 +0200)
committerJakub Jelinek <jakub@gcc.gnu.org>
Fri, 1 Aug 2014 07:52:43 +0000 (09:52 +0200)
commit944fa280bc92d197c443e369bb24405f007d46ab
tree893b88f145db7b629d24315901550a2b349d00ae
parentbbe2542f728dbd46ffc9997537e62228173ffa24
opts.c (common_handle_option): Handle -fsanitize=alignment.

* opts.c (common_handle_option): Handle -fsanitize=alignment.
* ubsan.h (enum ubsan_null_ckind): Add UBSAN_CTOR_CALL.
(ubsan_expand_bounds_ifn, ubsan_expand_null_ifn): Change return
type to bool.
* stor-layout.h (min_align_of_type): New prototype.
* asan.c (pass_sanopt::execute): Don't perform gsi_next if
ubsan_expand* told us not to do it.  Remove the extra gsi_end_p
check.
* ubsan.c: Include builtins.h.
(ubsan_expand_bounds_ifn): Change return type to bool,
always return true.
(ubsan_expand_null_ifn): Change return type to bool, change
argument to gimple_stmt_iterator *.  Handle both null and alignment
sanitization, take type from ckind argument's type rather than
first argument.
(instrument_member_call): Removed.
(instrument_mem_ref): Remove t argument, add mem and base arguments.
Handle both null and alignment sanitization, don't say whole
struct access is member access.  Build 3 argument IFN_UBSAN_NULL
call instead of 2 argument.
(instrument_null): Adjust instrument_mem_ref caller.  Don't
instrument calls here.
(pass_ubsan::gate, pass_ubsan::execute): Handle SANITIZE_ALIGNMENT
like SANITIZE_NULL.
* stor-layout.c (min_align_of_type): New function.
* flag-types.h (enum sanitize_code): Add SANITIZE_ALIGNMENT.
Or it into SANITIZE_UNDEFINED.
* doc/invoke.texi (-fsanitize=alignment): Document.
cp/
* cp-gimplify.c (cp_genericize_r): For -fsanitize=null and/or
-fsanitize=alignment call ubsan_maybe_instrument_reference
for casts to REFERENCE_TYPE and ubsan_maybe_instrument_member_call
for calls to member functions.
c-family/
* c-common.h (min_align_of_type): Removed prototype.
* c-common.c (min_align_of_type): Removed.
* c-ubsan.h (ubsan_maybe_instrument_reference,
ubsan_maybe_instrument_member_call): New prototypes.
* c-ubsan.c: Include stor-layout.h and builtins.h.
(ubsan_maybe_instrument_reference_or_call,
ubsan_maybe_instrument_reference, ubsan_maybe_instrument_call): New
functions.
testsuite/
* c-c++-common/ubsan/align-1.c: New test.
* c-c++-common/ubsan/align-2.c: New test.
* c-c++-common/ubsan/align-3.c: New test.
* c-c++-common/ubsan/align-4.c: New test.
* c-c++-common/ubsan/align-5.c: New test.
* c-c++-common/ubsan/attrib-4.c: New test.
* g++.dg/ubsan/align-1.C: New test.
* g++.dg/ubsan/align-2.C: New test.
* g++.dg/ubsan/align-3.C: New test.
* g++.dg/ubsan/attrib-1.C: New test.
* g++.dg/ubsan/null-1.C: New test.
* g++.dg/ubsan/null-2.C: New test.

From-SVN: r213406
29 files changed:
gcc/ChangeLog
gcc/asan.c
gcc/c-family/ChangeLog
gcc/c-family/c-common.c
gcc/c-family/c-common.h
gcc/c-family/c-ubsan.c
gcc/c-family/c-ubsan.h
gcc/cp/ChangeLog
gcc/cp/cp-gimplify.c
gcc/doc/invoke.texi
gcc/flag-types.h
gcc/opts.c
gcc/stor-layout.c
gcc/stor-layout.h
gcc/testsuite/ChangeLog
gcc/testsuite/c-c++-common/ubsan/align-1.c [new file with mode: 0644]
gcc/testsuite/c-c++-common/ubsan/align-2.c [new file with mode: 0644]
gcc/testsuite/c-c++-common/ubsan/align-3.c [new file with mode: 0644]
gcc/testsuite/c-c++-common/ubsan/align-4.c [new file with mode: 0644]
gcc/testsuite/c-c++-common/ubsan/align-5.c [new file with mode: 0644]
gcc/testsuite/c-c++-common/ubsan/attrib-4.c [new file with mode: 0644]
gcc/testsuite/g++.dg/ubsan/align-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/ubsan/align-2.C [new file with mode: 0644]
gcc/testsuite/g++.dg/ubsan/align-3.C [new file with mode: 0644]
gcc/testsuite/g++.dg/ubsan/attrib-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/ubsan/null-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/ubsan/null-2.C [new file with mode: 0644]
gcc/ubsan.c
gcc/ubsan.h