From: Jason Merrill <jason@redhat.com>
Date: Tue, 13 Jan 2015 14:49:10 +0000 (-0500)
Subject: re PR c++/64251 (Chromium build error only with --enable-checking=yes)
X-Git-Tag: releases/gcc-4.8.5~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97ac6836cdb1a51b59deee738ce042409dd59ad8;p=thirdparty%2Fgcc.git

re PR c++/64251 (Chromium build error only with --enable-checking=yes)

	PR c++/64251
	* decl2.c (mark_used): Don't mark if in_template_function.

From-SVN: r219535
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 090233abba03..ff3162839f7d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/64251
+	* decl2.c (mark_used): Don't mark if in_template_function.
+
 	PR c++/64297
 	* typeck.c (apply_memfn_quals): Correct wrong TYPE_CANONICAL.
 
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 7dd98c07e0ef..1a604a459b14 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -4606,7 +4606,7 @@ mark_used (tree decl)
       --function_depth;
     }
 
-  if (processing_template_decl)
+  if (processing_template_decl || in_template_function ())
     return true;
 
   /* Check this too in case we're within fold_non_dependent_expr.  */
diff --git a/gcc/testsuite/g++.dg/template/non-dependent14.C b/gcc/testsuite/g++.dg/template/non-dependent14.C
new file mode 100644
index 000000000000..b257d9baf1a7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/non-dependent14.C
@@ -0,0 +1,7 @@
+// PR c++/64251
+
+class DictionaryValue {};
+template <typename T> void CreateValue(T) {
+  DictionaryValue(0);
+  CreateValue(0);
+}