aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp/init.c')
-rw-r--r--gcc/cp/init.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index c842aac..9f886c0 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1047,12 +1047,17 @@ emit_mem_initializers (tree mem_inits)
in_base_initializer = 1;
/* Initialize base classes. */
- while (mem_inits
- && TREE_CODE (TREE_PURPOSE (mem_inits)) != FIELD_DECL)
+ for (; (mem_inits
+ && TREE_CODE (TREE_PURPOSE (mem_inits)) != FIELD_DECL);
+ mem_inits = TREE_CHAIN (mem_inits))
{
tree subobject = TREE_PURPOSE (mem_inits);
tree arguments = TREE_VALUE (mem_inits);
+ /* We already have issued an error message. */
+ if (arguments == error_mark_node)
+ continue;
+
if (arguments == NULL_TREE)
{
/* If these initializations are taking place in a copy constructor,
@@ -1085,8 +1090,6 @@ emit_mem_initializers (tree mem_inits)
tf_warning_or_error);
expand_cleanup_for_base (subobject, NULL_TREE);
}
-
- mem_inits = TREE_CHAIN (mem_inits);
}
in_base_initializer = 0;