From: Jason Merrill <jason@redhat.com>
Date: Wed, 12 Jul 2006 21:57:58 +0000 (-0400)
Subject: re PR c++/28217 (ICE in tree_int_cst_sgn)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ec0897deddeb168c4d6689666560b9ad85430a07;p=gcc.git

re PR c++/28217 (ICE in tree_int_cst_sgn)

        PR c++/28217
        * semantics.c (note_decl_for_pch): Don't premangle templates.

From-SVN: r115399
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dca987463c5..c7aa9186c93 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12  Jason Merrill  <jason@redhat.com>
+
+	PR c++/28217
+	* semantics.c (note_decl_for_pch): Don't premangle templates.
+
 2006-07-12  Martin Michlmayr  <tbm@cyrius.com>
 
 	* typeck.c (string_conv_p): Remove spurious quotation mark in
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 9ecace6806a..3d5957aa6fb 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2339,8 +2339,9 @@ note_decl_for_pch (tree decl)
 
   /* There's a good chance that we'll have to mangle names at some
      point, even if only for emission in debugging information.  */
-  if (TREE_CODE (decl) == VAR_DECL
-      || TREE_CODE (decl) == FUNCTION_DECL)
+  if ((TREE_CODE (decl) == VAR_DECL
+       || TREE_CODE (decl) == FUNCTION_DECL)
+      && !processing_template_decl)
     mangle_decl (decl);
 }