Index: pt.c
===================================================================
--- pt.c	(revision 210043)
+++ pt.c	(working copy)
@@ -462,7 +462,7 @@ maybe_begin_member_template_processing (tree decl)
   bool nsdmi = TREE_CODE (decl) == FIELD_DECL;
 
   if (nsdmi)
-    decl = (CLASSTYPE_TEMPLATE_INFO (DECL_CONTEXT (decl))
+    decl = (CLASSTYPE_IS_TEMPLATE (DECL_CONTEXT (decl))
 	    ? CLASSTYPE_TI_TEMPLATE (DECL_CONTEXT (decl))
 	    : NULL_TREE);