re PR c++/61566 (ICE in write_unscoped_name)

	PR c++/61566
	* pt.c (lookup_template_class_1): Revert recent change.
	* mangle.c (CLASSTYPE_TEMPLATE_ID_P): Revert recent change.

From-SVN: r214049

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c926978bdcd33bda528a3708bde0c677270d61b2..059ae602b2d51dc1e1bec5f55b6030b39e0d0187 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-08-15  Jason Merrill  <jason@redhat.com>
 
+       PR c++/61566
+       * pt.c (lookup_template_class_1): Revert recent change.
+       * mangle.c (CLASSTYPE_TEMPLATE_ID_P): Revert recent change.
+
        PR c++/61566
        * pt.c (instantiate_class_template_1): Ignore lambda on
        CLASSTYPE_DECL_LIST.

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index ac165e021d99305999355cc13a169a940c8db445..40508ab0cc34bcb29ba2bb2526ad92af5655b18d 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -87,7 +87,6 @@ along with GCC; see the file COPYING3.  If not see
   (TYPE_LANG_SPECIFIC (NODE) != NULL                                   \
    && (TREE_CODE (NODE) == BOUND_TEMPLATE_TEMPLATE_PARM                        \
        || (CLASSTYPE_TEMPLATE_INFO (NODE) != NULL                      \
-          && !LAMBDA_TYPE_P (NODE)                                     \
           && (PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (NODE))))))
 
 /* Things we only need one of.  This module is not reentrant.  */

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 611bfd6b7a1f72f0e93c521f73b52a2196f0b024..41fd424da8f520953ccdfc61eb260bb5683b7515 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7878,8 +7878,6 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
          && TMPL_ARGS_HAVE_MULTIPLE_LEVELS (arglist)
          /* the enclosing class must be an instantiation...  */
          && CLASS_TYPE_P (context)
-         /* We don't do partial instantiation of closures.  */
-         && !LAMBDA_TYPE_P (TREE_TYPE (gen_tmpl))
          && !same_type_p (context, DECL_CONTEXT (gen_tmpl)))
        {
          tree partial_inst_args;