re PR c++/51611 ([c++0x] ICE with non-static data member initializer and virtual...
authorJason Merrill <jason@redhat.com>
Wed, 21 Dec 2011 19:19:47 +0000 (14:19 -0500)
committerJason Merrill <jason@gcc.gnu.org>
Wed, 21 Dec 2011 19:19:47 +0000 (14:19 -0500)
commitc65b06073ce31831f65fce84a393c106c1ad5a07
treef9cb257f4823f2b31482274185ea050dec8ef4e9
parente2c4d88e42f75633a0c55de1400dbee322438d70
re PR c++/51611 ([c++0x] ICE with non-static data member initializer and virtual base class)

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.

From-SVN: r182602
gcc/cp/ChangeLog
gcc/cp/class.c
gcc/cp/cp-gimplify.c
gcc/cp/cp-tree.h
gcc/cp/tree.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1.C [new file with mode: 0644]