From 8535d5aa16a895ba54ddb9c9453f093ad42f505e Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 3 Jun 2019 23:17:09 +0000 Subject: [PATCH] parser.c (cp_parser_unqualified_id): Use build_min_nt_loc in five places. 2019-06-03 Paolo Carlini * parser.c (cp_parser_unqualified_id): Use build_min_nt_loc in five places. From-SVN: r271893 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/parser.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1cfa97c6ba5..338490de9ef 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-06-03 Paolo Carlini + + * parser.c (cp_parser_unqualified_id): Use build_min_nt_loc in + five places. + 2019-06-01 Ville Voutilainen PR c++/85254 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 1de35da83ec..94411447e1d 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -6052,7 +6052,7 @@ cp_parser_unqualified_id (cp_parser* parser, && constructor_name_p (token->u.value, scope)))) { cp_lexer_consume_token (parser->lexer); - return cp_expr (build_nt (BIT_NOT_EXPR, scope), loc); + return build_min_nt_loc (loc, BIT_NOT_EXPR, scope); } /* ~auto means the destructor of whatever the object is. */ @@ -6063,7 +6063,7 @@ cp_parser_unqualified_id (cp_parser* parser, "%<~auto%> only available with " "%<-std=c++14%> or %<-std=gnu++14%>"); cp_lexer_consume_token (parser->lexer); - return cp_expr (build_nt (BIT_NOT_EXPR, make_auto (), loc)); + return build_min_nt_loc (loc, BIT_NOT_EXPR, make_auto ()); } /* If there was an explicit qualification (S::~T), first look @@ -6153,8 +6153,8 @@ cp_parser_unqualified_id (cp_parser* parser, time. */ type_decl = cp_parser_identifier (parser); if (type_decl != error_mark_node) - type_decl = build_nt (BIT_NOT_EXPR, type_decl); - return cp_expr (type_decl, loc); + type_decl = build_min_nt_loc (loc, BIT_NOT_EXPR, type_decl); + return type_decl; } } /* If an error occurred, assume that the name of the @@ -6162,7 +6162,7 @@ cp_parser_unqualified_id (cp_parser* parser, class. That allows us to keep parsing after running into ill-formed destructor names. */ if (type_decl == error_mark_node && scope) - return build_nt (BIT_NOT_EXPR, scope); + return build_min_nt_loc (loc, BIT_NOT_EXPR, scope); else if (type_decl == error_mark_node) return error_mark_node; @@ -6189,7 +6189,7 @@ cp_parser_unqualified_id (cp_parser* parser, "typedef-name %qD used as destructor declarator", type_decl); - return cp_expr (build_nt (BIT_NOT_EXPR, TREE_TYPE (type_decl), loc)); + return build_min_nt_loc (loc, BIT_NOT_EXPR, TREE_TYPE (type_decl)); } case CPP_KEYWORD: -- 2.30.2