From: Jason Merrill <jason@redhat.com>
Date: Tue, 15 Apr 2003 16:26:44 +0000 (-0400)
Subject: decl2.c (mark_used): Don't instantiate anything if skip_evaluation.
X-Git-Tag: releases/gcc-3.2.3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aa2166c5937826c107bb6a395168d164393ff8e;p=thirdparty%2Fgcc.git

decl2.c (mark_used): Don't instantiate anything if skip_evaluation.

        * decl2.c (mark_used): Don't instantiate anything if
        skip_evaluation.

From-SVN: r65644
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 047d593cff31..d3d379ff55e5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-15  Jason Merrill  <jason@redhat.com>
+
+	* decl2.c (mark_used): Don't instantiate anything if
+	skip_evaluation.
+
 2003-03-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* Backport from mainline:
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1dbaaf4b27e7..681fd1a47845 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -5195,10 +5195,10 @@ mark_used (decl)
      tree decl;
 {
   TREE_USED (decl) = 1;
-  if (processing_template_decl)
+  if (processing_template_decl || skip_evaluation)
     return;
-  if (!skip_evaluation)
-    assemble_external (decl);
+
+  assemble_external (decl);
 
   /* Is it a synthesized method that needs to be synthesized?  */
   if (TREE_CODE (decl) == FUNCTION_DECL