[Bug c++/50614] [4.7 Regression] [C++0x] ICE: tree check: expected field_decl, have identifier_node in component_ref_field_offset, at expr.c:6697 with -fcompare-debug and a non-static initializer

[jason at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50614

--- Comment #4 from Jason Merrill <jason at gcc dot gnu.org> 2011-10-13 21:23:52 UTC ---
Author: jason
Date: Thu Oct 13 21:23:47 2011
New Revision: 179945

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=179945
Log:
    PR c++/50614
    * cp-tree.h (VAR_TEMPL_TYPE_FIELD_OR_FUNCTION_DECL_CHECK): New.
    (DECL_TEMPLATE_INFO): Use it.
    * pt.c (tsubst_decl) [FIELD_DECL]: Set DECL_TEMPLATE_INFO
    if the decl has an NSDMI.
    * init.c (perform_member_init): Use it.

Added:
    trunk/gcc/testsuite/g++.dg/cpp0x/nsdmi-template2.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/cp-tree.h
    trunk/gcc/cp/init.c
    trunk/gcc/cp/pt.c
    trunk/gcc/testsuite/ChangeLog