Skip to content

R
riscv-gcc-1
Commit c3b0f4c6 by Jason Merrill Committed by Jason Merrill
Options

* error.c (dump_expr): Use is_this_parameter. 

From-SVN: r249104
parent a01f151f
Showing with 4 additions and 5 deletions
gcc/cp/ChangeLog
2017-06-11 Jason Merrill <jason@redhat.com> 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 * cp-tree.h, decl2.c, mangle.c, parser.c, pt.c, semantics.c: Use
id_equal. id_equal.
......
gcc/cp/error.c
...@@ -2194,8 +2194,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags) ...@@ -2194,8 +2194,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
flags | TFF_EXPR_IN_PARENS); flags | TFF_EXPR_IN_PARENS);
pp_cxx_dot (pp); pp_cxx_dot (pp);
} }
else if (TREE_CODE (ob) != PARM_DECL else if (!is_this_parameter (ob))
|| strcmp (IDENTIFIER_POINTER (DECL_NAME (ob)), "this"))
{ {
dump_expr (pp, ob, flags | TFF_EXPR_IN_PARENS); dump_expr (pp, ob, flags | TFF_EXPR_IN_PARENS);
pp_cxx_arrow (pp); pp_cxx_arrow (pp);
...@@ -2276,9 +2275,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags) ...@@ -2276,9 +2275,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
if (INDIRECT_REF_P (ob)) if (INDIRECT_REF_P (ob))
{ {
ob = TREE_OPERAND (ob, 0); ob = TREE_OPERAND (ob, 0);
if (TREE_CODE (ob) != PARM_DECL if (!is_this_parameter (ob))
|| (DECL_NAME (ob)
&& strcmp (IDENTIFIER_POINTER (DECL_NAME (ob)), "this")))
{ {
dump_expr (pp, ob, flags | TFF_EXPR_IN_PARENS); dump_expr (pp, ob, flags | TFF_EXPR_IN_PARENS);
if (TREE_CODE (TREE_TYPE (ob)) == REFERENCE_TYPE) if (TREE_CODE (TREE_TYPE (ob)) == REFERENCE_TYPE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment