aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2003-04-15 12:26:44 -0400
committerJason Merrill <jason@gcc.gnu.org>2003-04-15 12:26:44 -0400
commit7aa2166c5937826c107bb6a395168d164393ff8e (patch)
tree63f0689dd83eee7fbe8e3c555f657b0224e0ae11
parent28e8cf6d61b0005b1349c80487fe758154ab4e51 (diff)
downloadgcc-7aa2166c5937826c107bb6a395168d164393ff8e.zip
gcc-7aa2166c5937826c107bb6a395168d164393ff8e.tar.gz
gcc-7aa2166c5937826c107bb6a395168d164393ff8e.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl2.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 047d593..d3d379f 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 1dbaaf4..681fd1a 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