aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/init.c
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2011-12-05 20:44:50 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2011-12-05 20:44:50 +0000
commita9eba00e1b73fe6ac5f6d3dcad4a015a4e8eb4d4 (patch)
tree1b1a530d5675327975ac8b05377aa837cfe94bbd /gcc/cp/init.c
parent671b487dc35fcde6a5f611e0714b419953c4c3ed (diff)
downloadgcc-a9eba00e1b73fe6ac5f6d3dcad4a015a4e8eb4d4.zip
gcc-a9eba00e1b73fe6ac5f6d3dcad4a015a4e8eb4d4.tar.gz
gcc-a9eba00e1b73fe6ac5f6d3dcad4a015a4e8eb4d4.tar.bz2
re PR c++/51399 ([c++0x] [4.7 Regression] ICE with invalid initializer list)
/cp 2011-12-05 Paolo Carlini <paolo.carlini@oracle.com> PR c++/51399 * init.c (perform_member_init): Early return if init is error_mark_node. /testsuite 2011-12-05 Paolo Carlini <paolo.carlini@oracle.com> PR c++/51399 * g++.dg/cpp0x/initlist62.C: New. From-SVN: r182025
Diffstat (limited to 'gcc/cp/init.c')
-rw-r--r--gcc/cp/init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 8aa8285..8e28e3b 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -542,6 +542,9 @@ perform_member_init (tree member, tree init)
}
}
+ if (init == error_mark_node)
+ return;
+
/* Effective C++ rule 12 requires that all data members be
initialized. */
if (warn_ecpp && init == NULL_TREE && TREE_CODE (type) != ARRAY_TYPE)