From 5e59e9cd553bdbf58dca2c865e7af20c1ea89bd1 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 1 Dec 2015 11:59:51 -0500 Subject: [PATCH 16/26] FIXME: convert finish_parenthesized_expr to cp_expr --- gcc/cp/cp-tree.h | 2 +- gcc/cp/semantics.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 22ed60a..5cfc4a5 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6346,7 +6346,7 @@ extern tree finish_asm_stmt (int, tree, tree, tree, tree, tree); extern tree finish_label_stmt (tree); extern void finish_label_decl (tree); -extern tree finish_parenthesized_expr (tree); +extern cp_expr finish_parenthesized_expr (cp_expr); extern tree force_paren_expr (tree); extern tree finish_non_static_data_member (tree, tree, tree); extern tree begin_stmt_expr (void); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index d2db52f..144b59d 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1672,8 +1672,8 @@ force_paren_expr (tree expr) /* Finish a parenthesized expression EXPR. */ -tree -finish_parenthesized_expr (tree expr) +cp_expr +finish_parenthesized_expr (cp_expr expr) { if (EXPR_P (expr)) /* This inhibits warnings in c_common_truthvalue_conversion. */ @@ -1688,7 +1688,7 @@ finish_parenthesized_expr (tree expr) if (TREE_CODE (expr) == STRING_CST) PAREN_STRING_LITERAL_P (expr) = 1; - expr = force_paren_expr (expr); + expr = cp_expr (force_paren_expr (expr), expr.get_location ()); return expr; } -- 1.8.5.3