diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-26 09:52:48 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-26 09:52:48 +0000 |
| commit | e2225bd419ce30e32adc080be8cfe407d649fc95 (patch) | |
| tree | a5817c2d93ec5378d7f944232b39f405296aa94f /gcc/cp | |
| parent | 2c05794c14d393ab5085b99a6c712203e43b2014 (diff) | |
| download | gcc-e2225bd419ce30e32adc080be8cfe407d649fc95.tar.gz | |
PR c++/68508
* cp-tree.h (cp_ubsan_maybe_instrument_downcast): Add INTYPE argument.
* cp-ubsan.c (cp_ubsan_maybe_instrument_downcast): Likewise. Use
it instead of or in addition to TREE_TYPE (op). Use
is_properly_derived_from, return NULL_TREE if TREE_TYPE (intype) and
TREE_TYPE (type) are the same type minus qualifiers.
* typeck.c (build_static_cast_1): Adjust callers.
* g++.dg/ubsan/pr68508.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230928 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-ubsan.c | 7 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 6 |
4 files changed, 19 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 82a29a3b0f6..90d86dca052 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2015-11-26 Jakub Jelinek <jakub@redhat.com> + + PR c++/68508 + * cp-tree.h (cp_ubsan_maybe_instrument_downcast): Add INTYPE argument. + * cp-ubsan.c (cp_ubsan_maybe_instrument_downcast): Likewise. Use + it instead of or in addition to TREE_TYPE (op). Use + is_properly_derived_from, return NULL_TREE if TREE_TYPE (intype) and + TREE_TYPE (type) are the same type minus qualifiers. + * typeck.c (build_static_cast_1): Adjust callers. + 2015-11-25 Martin Sebor <msebor@redhat.com> PR c++/67876 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 1672291f9b6..caa601d1c98 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6854,7 +6854,7 @@ extern bool cilk_valid_spawn (tree); /* In cp-ubsan.c */ extern void cp_ubsan_maybe_instrument_member_call (tree); extern void cp_ubsan_instrument_member_accesses (tree *); -extern tree cp_ubsan_maybe_instrument_downcast (location_t, tree, tree); +extern tree cp_ubsan_maybe_instrument_downcast (location_t, tree, tree, tree); extern tree cp_ubsan_maybe_instrument_cast_to_vbase (location_t, tree, tree); /* -- end of C++ */ diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c index e780c2ef2f0..6ffeb16ce1d 100644 --- a/gcc/cp/cp-ubsan.c +++ b/gcc/cp/cp-ubsan.c @@ -243,13 +243,14 @@ cp_ubsan_instrument_member_accesses (tree *t_p) /* Instrument downcast. */ tree -cp_ubsan_maybe_instrument_downcast (location_t loc, tree type, tree op) +cp_ubsan_maybe_instrument_downcast (location_t loc, tree type, + tree intype, tree op) { if (!POINTER_TYPE_P (type) + || !POINTER_TYPE_P (intype) || !POINTER_TYPE_P (TREE_TYPE (op)) - || !CLASS_TYPE_P (TREE_TYPE (type)) || !CLASS_TYPE_P (TREE_TYPE (TREE_TYPE (op))) - || !DERIVED_FROM_P (TREE_TYPE (TREE_TYPE (op)), TREE_TYPE (type))) + || !is_properly_derived_from (TREE_TYPE (type), TREE_TYPE (intype))) return NULL_TREE; return cp_ubsan_maybe_instrument_vptr (loc, op, TREE_TYPE (type), true, diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 95178905f9e..1d2943f50fb 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -6590,7 +6590,8 @@ build_static_cast_1 (tree type, tree expr, bool c_cast_p, if (flag_sanitize & SANITIZE_VPTR) { tree ubsan_check - = cp_ubsan_maybe_instrument_downcast (input_location, type, expr); + = cp_ubsan_maybe_instrument_downcast (input_location, type, + intype, expr); if (ubsan_check) expr = ubsan_check; } @@ -6737,7 +6738,8 @@ build_static_cast_1 (tree type, tree expr, bool c_cast_p, if (flag_sanitize & SANITIZE_VPTR) { tree ubsan_check - = cp_ubsan_maybe_instrument_downcast (input_location, type, expr); + = cp_ubsan_maybe_instrument_downcast (input_location, type, + intype, expr); if (ubsan_check) expr = ubsan_check; } |