C++ PATCH for c++/65646 (ICE after error specializing missing static data member)

C++ PATCH for c++/65646 (ICE after error specializing missing static data member)

[Jason Merrill]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

This testcase started crashing because the added call to 
check_explicit_specialization does a SET_DECL_TEMPLATE_SPECIALIZATION 
which wasn't happening previously, and then determine_visibility assumes 
that if DECL_USE_TEMPLATE is set, so is DECL_TEMPLATE_INFO.  Fixed for 
GCC 5 by avoiding the call if we aren't dealing with a member template.

Tested x86_64-pc-linux-gnu, applying to trunk.

[-- Attachment #2: 65646.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]

commit 5dbbdeda316eaa8f2b2a43fc28762f7d7ecca22c
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Apr 1 10:14:53 2015 -0400

    	PR c++/65646
    	* decl.c (grokvardecl): Don't call check_explicit_specialization
    	for non-template members of a class template.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index f05aefa..31b8e0c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8210,7 +8210,9 @@ grokvardecl (tree type,
     DECL_INTERFACE_KNOWN (decl) = 1;
 
   // Handle explicit specializations and instantiations of variable templates.
-  if (orig_declarator)
+  if (orig_declarator
+      /* For GCC 5 fix 65646 this way.  */
+      && current_tmpl_spec_kind (template_count) != tsk_none)
     decl = check_explicit_specialization (orig_declarator, decl,
 					  template_count, 0);
 
diff --git a/gcc/testsuite/g++.dg/template/static36.C b/gcc/testsuite/g++.dg/template/static36.C
new file mode 100644
index 0000000..36c48b0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/static36.C
@@ -0,0 +1,4 @@
+// PR c++/65646
+
+template <typename = int> class A {};
+template <> A<> &A<>::a;	// { dg-error "" }

Re: C++ PATCH for c++/65646 (ICE after error specializing missing static data member)

[Jason Merrill]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

On 04/01/2015 12:36 PM, Jason Merrill wrote:
> This testcase started crashing because the added call to
> check_explicit_specialization does a SET_DECL_TEMPLATE_SPECIALIZATION
> which wasn't happening previously, and then determine_visibility assumes
> that if DECL_USE_TEMPLATE is set, so is DECL_TEMPLATE_INFO.  Fixed for
> GCC 5 by avoiding the call if we aren't dealing with a member template.

And fixed for GCC 6 by adjusting check_explicit_specialization.



[-- Attachment #2: 65646-2.patch --]
[-- Type: text/x-patch, Size: 1259 bytes --]

commit a7205fbf919d0f460c278843159bb068745406dc
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Apr 1 12:48:40 2015 -0400

    	PR c++/65646
    	* pt.c (check_explicit_specialization): Don't
    	SET_DECL_TEMPLATE_SPECIALIZATION for a variable with no template
    	headers.
    	* decl.c (grokvardecl): Revert earlier fix.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 29d6e73..6ec1579 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8210,9 +8210,7 @@ grokvardecl (tree type,
     DECL_INTERFACE_KNOWN (decl) = 1;
 
   // Handle explicit specializations and instantiations of variable templates.
-  if (orig_declarator
-      /* For GCC 5 fix 65646 this way.  */
-      && current_tmpl_spec_kind (template_count) != tsk_none)
+  if (orig_declarator)
     decl = check_explicit_specialization (orig_declarator, decl,
 					  template_count, 0);
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d45fe7c..ea0d3bc 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -2424,7 +2424,7 @@ check_explicit_specialization (tree declarator,
   switch (tsk)
     {
     case tsk_none:
-      if (processing_specialization)
+      if (processing_specialization && TREE_CODE (decl) != VAR_DECL)
 	{
 	  specialization = 1;
 	  SET_DECL_TEMPLATE_SPECIALIZATION (decl);