diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cp-array-notation.c | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-ubsan.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5155540..4d8ec3e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-06-26 Marek Polacek <polacek@redhat.com> + + * cp-array-notation.c (expand_sec_reduce_builtin): Use INDIRECT_REF_P. + * cp-ubsan.c (cp_ubsan_check_member_access_r): Likewise. + 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * call.c: Remove ipa-ref.h and plugin-api.h from include list. diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c index 3b8610f..9b8034e 100644 --- a/gcc/cp/cp-array-notation.c +++ b/gcc/cp/cp-array-notation.c @@ -345,7 +345,7 @@ expand_sec_reduce_builtin (tree an_builtin_fn, tree *new_var) array_ind_value = get_temp_regvar (TREE_TYPE (func_parm), func_parm); array_op0 = (*array_operand)[0]; - if (TREE_CODE (array_op0) == INDIRECT_REF) + if (INDIRECT_REF_P (array_op0)) array_op0 = TREE_OPERAND (array_op0, 0); switch (an_type) { diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c index 0c1b047..c0d1ffc 100644 --- a/gcc/cp/cp-ubsan.c +++ b/gcc/cp/cp-ubsan.c @@ -200,7 +200,7 @@ cp_ubsan_check_member_access_r (tree *stmt_p, int *walk_subtrees, void *data) { case ADDR_EXPR: t = TREE_OPERAND (stmt, 0); - while ((TREE_CODE (t) == MEM_REF || TREE_CODE (t) == INDIRECT_REF) + while ((TREE_CODE (t) == MEM_REF || INDIRECT_REF_P (t)) && TREE_CODE (TREE_OPERAND (t, 0)) == ADDR_EXPR) t = TREE_OPERAND (TREE_OPERAND (t, 0), 0); if (handled_component_p (t)) |