re PR c++/23044 (ICE on valid code)

cp:
	PR c++/23044
	* pt.c (tsubst_qualified_id): A SCOPE_REF can still remain.
testsuite:
	PR c++/23044
	* g++.dg/template/instantiate8.C: New.

From-SVN: r103395

gcc/cp/ChangeLog

+2005-08-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/23044
+	* pt.c (tsubst_qualified_id): A SCOPE_REF can still remain.
+
 2005-08-22  James E Wilson  <wilson@specifix.com>
 
 	PR tree-optimization/23426

gcc/cp/pt.c

@@ -7680,6 +7680,7 @@ tsubst_qualified_id (tree qualified_id, tree args,
       expr = finish_qualified_id_expr (scope, expr, done, address_p);
     }
 
+  if (TREE_CODE (expr) != SCOPE_REF)
     expr = convert_from_reference (expr);
 
   return expr;

gcc/testsuite/ChangeLog

+2005-08-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/23044
+	* g++.dg/template/instantiate8.C: New.
+
 2005-08-23  J"orn Rennecke <joern.rennecke@st.com>
 
 	PR middle-end/23467

gcc/testsuite/g++.dg/template/instantiate8.C

+// Copyright (C) 2005 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 18 Aug 2005 <nathan@codesourcery.com>
+
+// PR 22044: ICE
+// Origin: Andrew Pinski <pinskia@gcc.gnu.org>
+
+struct no_context {
+  template< class Event > void no_function( const Event & );
+};
+template< class Event, class TransitionContext = no_context,
+void ( TransitionContext::*pTransitionAction )( const Event & ) = &no_context::no_function< Event > >
+struct transition
+{
+  struct EvFlipBit {};
+  typedef transition<EvFlipBit> type;
+};
+