Commit ea55c915 by Jason Merrill Committed by Jason Merrill

* semantics.c (force_paren_expr): Preserve location.

From-SVN: r274120
parent 55f863c4
2019-08-05 Jason Merrill <jason@redhat.com>
* semantics.c (force_paren_expr): Preserve location.
2019-08-02 Marek Polacek <polacek@redhat.com> 2019-08-02 Marek Polacek <polacek@redhat.com>
PR c++/91230 - wrong error with __PRETTY_FUNCTION__ and generic lambda. PR c++/91230 - wrong error with __PRETTY_FUNCTION__ and generic lambda.
......
...@@ -1745,14 +1745,16 @@ force_paren_expr (tree expr) ...@@ -1745,14 +1745,16 @@ force_paren_expr (tree expr)
&& TREE_CODE (expr) != SCOPE_REF) && TREE_CODE (expr) != SCOPE_REF)
return expr; return expr;
location_t loc = cp_expr_location (expr);
if (TREE_CODE (expr) == COMPONENT_REF if (TREE_CODE (expr) == COMPONENT_REF
|| TREE_CODE (expr) == SCOPE_REF) || TREE_CODE (expr) == SCOPE_REF)
REF_PARENTHESIZED_P (expr) = true; REF_PARENTHESIZED_P (expr) = true;
else if (processing_template_decl) else if (processing_template_decl)
expr = build1 (PAREN_EXPR, TREE_TYPE (expr), expr); expr = build1_loc (loc, PAREN_EXPR, TREE_TYPE (expr), expr);
else else
{ {
expr = build1 (VIEW_CONVERT_EXPR, TREE_TYPE (expr), expr); expr = build1_loc (loc, VIEW_CONVERT_EXPR, TREE_TYPE (expr), expr);
REF_PARENTHESIZED_P (expr) = true; REF_PARENTHESIZED_P (expr) = true;
} }
......
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