FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/11945 (Incorrect warnings issued for comma-expressions inside templates)

Browse source 
cp:
	PR c++/11945
	* pt.c (build_non_dependent_expr): Look inside COND_EXPR and
	COMPOUND_EXPR.
	* semantics.c (finish_expr_stmt): Always convert to void.
	* typeck.c (build_x_compound_exp): Always convert to void.
testsuite:
	PR c++/11945
	* g++.dg/warn/noeffect2.C: New test.

From-SVN: r70606
This commit is contained in:
Nathan Sidwell 2003-08-20 18:00:09 +00:00 • committed by Nathan Sidwell
parent f2f3f409f6
commit 47d4c81198
6 changed files with 51 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/ChangeLog
View file

@ -1,3 +1,11 @@
2003-08-20 Nathan Sidwell <nathan@codesourcery.com>
PR c++/11945
* pt.c (build_non_dependent_expr): Look inside COND_EXPR and
COMPOUND_EXPR.
* semantics.c (finish_expr_stmt): Always convert to void.
* typeck.c (build_x_compound_exp): Always convert to void.
2003-08-19 Mark Mitchell <mark@codesourcery.com> 2003-08-19 Mark Mitchell <mark@codesourcery.com>
PR c++/11684 PR c++/11684

13
gcc/cp/pt.c
View file

@ -11797,6 +11797,19 @@ build_non_dependent_expr (tree expr)
types. */ types. */
if (TREE_CODE (expr) == OVERLOAD) if (TREE_CODE (expr) == OVERLOAD)
return expr; return expr;
if (TREE_CODE (expr) == COND_EXPR)
return build (COND_EXPR,
TREE_TYPE (expr),
TREE_OPERAND (expr, 0),
build_non_dependent_expr (TREE_OPERAND (expr, 1)),
build_non_dependent_expr (TREE_OPERAND (expr, 2)));
if (TREE_CODE (expr) == COMPOUND_EXPR)
return build (COMPOUND_EXPR,
TREE_TYPE (expr),
TREE_OPERAND (expr, 0),
build_non_dependent_expr (TREE_OPERAND (expr, 1)));
/* Otherwise, build a NON_DEPENDENT_EXPR. /* Otherwise, build a NON_DEPENDENT_EXPR.
REFERENCE_TYPEs are not stripped for expressions in templates REFERENCE_TYPEs are not stripped for expressions in templates

2
gcc/cp/semantics.c
View file

@ -421,6 +421,8 @@ finish_expr_stmt (tree expr)
{ {
if (!processing_template_decl) if (!processing_template_decl)
expr = convert_to_void (expr, "statement"); expr = convert_to_void (expr, "statement");
else if (!type_dependent_expression_p (expr))
convert_to_void (build_non_dependent_expr (expr), "statement");
r = add_stmt (build_stmt (EXPR_STMT, expr)); r = add_stmt (build_stmt (EXPR_STMT, expr));
} }

7
gcc/cp/typeck.c
View file

@ -4309,11 +4309,8 @@ build_x_compound_expr (tree op1, tree op2)
tree tree
build_compound_expr (tree lhs, tree rhs) build_compound_expr (tree lhs, tree rhs)
{ {
if (!processing_template_decl) lhs = decl_constant_value (lhs);
{ lhs = convert_to_void (lhs, "left-hand operand of comma");
lhs = decl_constant_value (lhs);
lhs = convert_to_void (lhs, "left-hand operand of comma");
}
if (lhs == error_mark_node || rhs == error_mark_node) if (lhs == error_mark_node || rhs == error_mark_node)
return error_mark_node; return error_mark_node;

8
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2003-08-20 Nathan Sidwell <nathan@codesourcery.com>
PR c++/11945
* g++.dg/warn/noeffect2.C: New test.
2003-08-19 Mark Mitchell <mark@codesourcery.com> 2003-08-19 Mark Mitchell <mark@codesourcery.com>
PR c++/10926 PR c++/10926
@ -54,6 +59,9 @@
2003-08-18 Nathan Sidwell <nathan@codesourcery.com> 2003-08-18 Nathan Sidwell <nathan@codesourcery.com>
PR c++/11957
* g++.dg/warn/noeffect1.C: New test.
* g++.dg/template/scope2.C: New test. * g++.dg/template/scope2.C: New test.
* g++.dg/template/error2.C: Correct dg-error * g++.dg/template/error2.C: Correct dg-error

18
gcc/testsuite/g++.dg/warn/noeffect2.C Normal file
View file

@ -0,0 +1,18 @@
// { dg-do compile }
// { dg-options "-Wall" }
// Copyright (C) 2003 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 18 Aug 2003 <nathan@codesourcery.com>
// Origin PR 11945 gerald@pfeifer.com
// PR 11945 inconsistent warnings
extern "C" void FormatDisk();
template <class T>
struct C {
C(){ FormatDisk(), 0; } // { dg-warning "right-hand operand of comma" "" }
};
template <class T>
void f() { FormatDisk(), 0; } // { dg-warning "right-hand operand of comma" "" }
void g() { FormatDisk(), 0; } // { dg-warning "right-hand operand of comma" "" }