diff options
| author | Jason Merrill <jason@redhat.com> | 2007-08-28 12:58:59 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2007-08-28 12:58:59 -0400 |
| commit | c2acde1ee12b2e11765fb43c861c71663768eba4 (patch) | |
| tree | cbbf22bab4a8353161a0cf07e3f3e790d18fc79c /gcc/cp/pt.c | |
| parent | 0a8fc2475a662ae69dbc0e8d964fe9489a595fde (diff) | |
| download | gcc-c2acde1ee12b2e11765fb43c861c71663768eba4.zip gcc-c2acde1ee12b2e11765fb43c861c71663768eba4.tar.gz gcc-c2acde1ee12b2e11765fb43c861c71663768eba4.tar.bz2 | |
re PR c++/29000 (ICE on invalid use of template in statement-expr)
PR c++/29000
* pt.c (build_non_dependent_expr, type_dependent_expression_p):
Look inside STMT_EXPR.
* semantics.c (stmt_expr_value_expr): New fn.
* cp-tree.h: Declare it.
* g++.dg/ext/stmtexpr12.C: New test.
From-SVN: r127868
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e33197c..e1eda24 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15277,6 +15277,9 @@ type_dependent_expression_p (tree expression) && !DECL_TEMPLATE_TEMPLATE_PARM_P (expression)) return false; + if (TREE_CODE (expression) == STMT_EXPR) + expression = stmt_expr_value_expr (expression); + if (TREE_TYPE (expression) == unknown_type_node) { if (TREE_CODE (expression) == ADDR_EXPR) @@ -15617,6 +15620,8 @@ build_non_dependent_expr (tree expr) /* Preserve OVERLOADs; the functions must be available to resolve types. */ inner_expr = expr; + if (TREE_CODE (inner_expr) == STMT_EXPR) + inner_expr = stmt_expr_value_expr (inner_expr); if (TREE_CODE (inner_expr) == ADDR_EXPR) inner_expr = TREE_OPERAND (inner_expr, 0); if (TREE_CODE (inner_expr) == COMPONENT_REF) |