[Bug c++/51611] [c++0x] ICE with non-static data member initializer and virtual base class

[jason at gcc dot gnu.org]

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

--- Comment #1 from Jason Merrill <jason at gcc dot gnu.org> 2011-12-21 19:19:52 UTC ---
Author: jason
Date: Wed Dec 21 19:19:47 2011
New Revision: 182602

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=182602
Log:
    PR c++/51611
    * cp-tree.h (CONVERT_EXPR_VBASE_PATH): New.
    * class.c (build_base_path): Defer vbase conversion in an NSDMI.
    * tree.c (bot_replace): Expand it here.
    * cp-gimplify.c (cp_genericize_r): Make sure deferred conversion
    doesn't leak into GENERIC.

Added:
    trunk/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/class.c
    trunk/gcc/cp/cp-gimplify.c
    trunk/gcc/cp/cp-tree.h
    trunk/gcc/cp/tree.c
    trunk/gcc/testsuite/ChangeLog