* error.c (dump_expr): Use is_this_parameter.

From-SVN: r249104

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index da085531209c00774f119e2f252022f663699226..6d2f28b8751057a72fa87fb53c20e910f7789373 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2017-06-11  Jason Merrill  <jason@redhat.com>
 
+       * error.c (dump_expr): Use is_this_parameter.
+
        * cp-tree.h, decl2.c, mangle.c, parser.c, pt.c, semantics.c: Use
        id_equal.
 

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index ed67d14567be701c5e0d308e10cebd359af7d98a..e53afa7522aad7e40c6e72051fb5e5cd5c8ce30a 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2194,8 +2194,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
                            flags | TFF_EXPR_IN_PARENS);
                pp_cxx_dot (pp);
              }
-           else if (TREE_CODE (ob) != PARM_DECL
-                    || strcmp (IDENTIFIER_POINTER (DECL_NAME (ob)), "this"))
+           else if (!is_this_parameter (ob))
              {
                dump_expr (pp, ob, flags | TFF_EXPR_IN_PARENS);
                pp_cxx_arrow (pp);
@@ -2276,9 +2275,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
        if (INDIRECT_REF_P (ob))
          {
            ob = TREE_OPERAND (ob, 0);
-           if (TREE_CODE (ob) != PARM_DECL
-               || (DECL_NAME (ob)
-                   && strcmp (IDENTIFIER_POINTER (DECL_NAME (ob)), "this")))
+           if (!is_this_parameter (ob))
              {
                dump_expr (pp, ob, flags | TFF_EXPR_IN_PARENS);
                if (TREE_CODE (TREE_TYPE (ob)) == REFERENCE_TYPE)