From 704c79040af06477eaa18ee560270f22214a359a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 10 Mar 2015 20:10:43 +0100 Subject: [PATCH] re PR c++/65127 (internal compiler error: tree check: expected tree that contains 'decl minimal' structure, have 'addr_expr' in parsing_nsdmi, at cp/parser.c:18311) PR c++/65127 * parser.c (parsing_nsdmi): Don't return true if current_class_ptr is not a PARM_DECL. * g++.dg/cpp0x/pr65127.C: New test. From-SVN: r221332 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/pr65127.C | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr65127.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 61c0b18e5ea..1202b0fc868 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-10 Jakub Jelinek + + PR c++/65127 + * parser.c (parsing_nsdmi): Don't return true if current_class_ptr + is not a PARM_DECL. + 2015-03-10 Jason Merrill PR c++/65333 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index ad132b1850f..a209ee608fa 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18314,7 +18314,9 @@ parsing_nsdmi (void) { /* We recognize NSDMI context by the context-less 'this' pointer set up by the function above. */ - if (current_class_ptr && DECL_CONTEXT (current_class_ptr) == NULL_TREE) + if (current_class_ptr + && TREE_CODE (current_class_ptr) == PARM_DECL + && DECL_CONTEXT (current_class_ptr) == NULL_TREE) return true; return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4899406f99d..e0daa10eb9b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-03-10 Jakub Jelinek + + PR c++/65127 + * g++.dg/cpp0x/pr65127.C: New test. + 2015-03-10 Jan Hubicka * gcc.dg/ipa/PR64550.c: Update template. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr65127.C b/gcc/testsuite/g++.dg/cpp0x/pr65127.C new file mode 100644 index 00000000000..2cdb8ee54d5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr65127.C @@ -0,0 +1,16 @@ +// PR c++/65127 +// { dg-do compile { target c++11 } } + +template +void +foo () +{ + static int i {100}; + struct { int id {i++}; } j; +} + +int +main () +{ + foo<0> (); +} -- 2.30.2