* name-lookup.c (push_class_level_binding): Sanity check.

From-SVN: r151931

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6c2ce9c..7629515 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-21  Jason Merrill  <jason@redhat.com>
+
+       * name-lookup.c (push_class_level_binding): Sanity check.
+
 2009-09-18  Jason Merrill  <jason@redhat.com>
 
        * decl2.c (determine_visibility): Make anonymous types internal.

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 4928506..d37cf44 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -2751,6 +2751,9 @@ push_class_level_binding (tree name, tree x)
 
   /* Check for invalid member names.  */
   gcc_assert (TYPE_BEING_DEFINED (current_class_type));
+  /* Check that we're pushing into the right binding level.  */
+  gcc_assert (current_class_type == class_binding_level->this_entity);
+
   /* We could have been passed a tree list if this is an ambiguous
      declaration. If so, pull the declaration out because
      check_template_shadow will not handle a TREE_LIST.  */