From 558c51c59dea8a6d596889350970fb1d6c947d79 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Tue, 1 Jun 2010 10:20:24 -0400 Subject: Undo inadvertent commit in rev 160105. From-SVN: r160107 --- gcc/cp/cvt.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'gcc/cp') diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 2654ccd..646610a 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -822,26 +822,22 @@ ocp_convert (tree type, tree expr, int convtype, int flags) tree convert_to_void (tree expr, const char *implicit, tsubst_flags_t complain) { + tree exprv; + if (expr == error_mark_node || TREE_TYPE (expr) == error_mark_node) return error_mark_node; - if (implicit == NULL) - mark_rvalue_use (expr); - else - { - tree exprv = expr; - - while (TREE_CODE (exprv) == COMPOUND_EXPR) - exprv = TREE_OPERAND (exprv, 1); - if (DECL_P (exprv) || handled_component_p (exprv)) - /* Expr is not being 'used' here, otherwise we whould have - called mark_{rl}value_use use here, which would have in turn - called mark_exp_read. Rather, we call mark_exp_read directly - to avoid some warnings when - -Wunused-but-set-{variable,parameter} is in effect. */ - mark_exp_read (exprv); - } + exprv = expr; + while (TREE_CODE (exprv) == COMPOUND_EXPR) + exprv = TREE_OPERAND (exprv, 1); + if (DECL_P (exprv) || handled_component_p (exprv)) + /* Expr is not being 'used' here, otherwise we whould have + called mark_{rl}value_use use here, which would have in turn + called mark_exp_read. Rather, we call mark_exp_read directly + to avoid some warnings when + -Wunused-but-set-{variable,parameter} is in effect. */ + mark_exp_read (exprv); if (!TREE_TYPE (expr)) return expr; -- cgit v1.1