diff options
| author | Jason Merrill <jason@redhat.com> | 2014-03-05 14:25:37 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-03-05 14:25:37 -0500 |
| commit | f9b381b8eb56252e302b88ea4fe89beffc33cf80 (patch) | |
| tree | 7b4f45e6fb8c0e4218f6f4caff40f24636a51154 | |
| parent | 5d264d62dc6d381510bea36469d50175fa6a39c2 (diff) | |
| download | gcc-f9b381b8eb56252e302b88ea4fe89beffc33cf80.zip gcc-f9b381b8eb56252e302b88ea4fe89beffc33cf80.tar.gz gcc-f9b381b8eb56252e302b88ea4fe89beffc33cf80.tar.bz2 | |
re PR c++/60409 ([c++1y] ICE on valid with template function)
PR c++/60409
* semantics.c (force_paren_expr): Only add a PAREN_EXPR to a
dependent expression.
From-SVN: r208352
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/regress1.C | 12 |
3 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9e7b9b7..a0b87bf 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-03-05 Jason Merrill <jason@redhat.com> + PR c++/60409 + * semantics.c (force_paren_expr): Only add a PAREN_EXPR to a + dependent expression. + PR c++/60361 * parser.c (cp_parser_template_id): Don't set up a CPP_TEMPLATE_ID if re-parsing might succeed. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 4081e0e..d2c453f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1609,7 +1609,7 @@ force_paren_expr (tree expr) && TREE_CODE (expr) != SCOPE_REF) return expr; - if (processing_template_decl) + if (type_dependent_expression_p (expr)) expr = build1 (PAREN_EXPR, TREE_TYPE (expr), expr); else { diff --git a/gcc/testsuite/g++.dg/cpp1y/regress1.C b/gcc/testsuite/g++.dg/cpp1y/regress1.C new file mode 100644 index 0000000..94b00eb --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/regress1.C @@ -0,0 +1,12 @@ +// PR c++/60409 +// { dg-options -std=c++1y } + +struct A +{ + void foo(); +}; + +template<typename T> void bar(T) +{ + (A().foo)(); +} |