[committed] C++ PATCH to use INDIRECT_REF_P

[Marek Polacek]

As the subject says.

Bootstrapped/regtested on x86_64-linux, applying to trunk.

2015-06-26  Marek Polacek  <pola...@redhat.com>

        * cp-array-notation.c (expand_sec_reduce_builtin): Use INDIRECT_REF_P.
        * cp-ubsan.c (cp_ubsan_check_member_access_r): Likewise.

diff --git gcc/cp/cp-array-notation.c gcc/cp/cp-array-notation.c
index 3b8610f..9b8034e 100644
--- gcc/cp/cp-array-notation.c
+++ 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 gcc/cp/cp-ubsan.c gcc/cp/cp-ubsan.c
index 0c1b047..c0d1ffc 100644
--- gcc/cp/cp-ubsan.c
+++ 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))

        Marek