re PR c++/49663 ([C++0x] ICE in lookup_base)

	PR c++/49663
	* pt.c (push_deduction_access_scope): Preserve
	processing_template_decl across push_to_top_level.
	And revert:
	* class.c (pushclass): Accept NULL argument.
	(popclass): Deal with popping null class.
	* pt.c (push_access_scope, pop_access_scope): Use them rather than
	push_to_top_level/pop_from_top_level.
	* name-lookup.c (lookup_name_real_1): Check current_class_type.

From-SVN: r176013

1 files changed, 3 insertions, 17 deletions

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 6aefd684075..7de104d4bc7 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6125,9 +6125,6 @@ restore_class_cache (void)
    So that we may avoid calls to lookup_name, we cache the _TYPE
    nodes of local TYPE_DECLs in the TREE_TYPE field of the name.
 
-   For use by push_access_scope, we allow TYPE to be null to temporarily
-   push out of class scope.  This does not actually change binding levels.
-
    For multiple inheritance, we perform a two-pass depth-first search
    of the type lattice.  */
 
@@ -6136,6 +6133,8 @@ pushclass (tree type)
 {
   class_stack_node_t csn;
 
+  type = TYPE_MAIN_VARIANT (type);
+
   /* Make sure there is enough room for the new entry on the stack.  */
   if (current_class_depth + 1 >= current_class_stack_size)
     {
@@ -6154,15 +6153,6 @@ pushclass (tree type)
   csn->hidden = 0;
   current_class_depth++;
 
-  if (type == NULL_TREE)
-    {
-      current_class_name = current_class_type = NULL_TREE;
-      csn->hidden = true;
-      return;
-    }
-
-  type = TYPE_MAIN_VARIANT (type);
-
   /* Now set up the new type.  */
   current_class_name = TYPE_NAME (type);
   if (TREE_CODE (current_class_name) == TYPE_DECL)
@@ -6207,11 +6197,7 @@ invalidate_class_lookup_cache (void)
 void
 popclass (void)
 {
-  if (current_class_type)
-    poplevel_class ();
-  else
-    gcc_assert (current_class_depth
-		&& current_class_stack[current_class_depth - 1].hidden);
+  poplevel_class ();
 
   current_class_depth--;
   current_class_name = current_class_stack[current_class_depth].name;