diff options
| author | Mark Mitchell <mark@codesourcery.com> | 1999-11-25 01:56:13 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-11-25 01:56:13 +0000 |
| commit | f0adc63709230f151d4e4693041097e2f6130c64 (patch) | |
| tree | 86b717901752066570c276c96561342b896a1d43 /gcc | |
| parent | 93d455621810ca1fcb759fcb6cc4c237ba02a584 (diff) | |
| download | gcc-f0adc63709230f151d4e4693041097e2f6130c64.zip gcc-f0adc63709230f151d4e4693041097e2f6130c64.tar.gz gcc-f0adc63709230f151d4e4693041097e2f6130c64.tar.bz2 | |
pt.c (tsubst_decl): Copy TREE_ASM_WRITTEN for VAR_DECLs.
* pt.c (tsubst_decl): Copy TREE_ASM_WRITTEN for VAR_DECLs.
* decl2.c (finish_vtable_vardecl): Don't prune vtables here.
From-SVN: r30656
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 1 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.pt/inline1.C | 14 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1320b21..f9ff037 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +1999-11-24 Mark Mitchell <mark@codesourcery.com> + + * pt.c (tsubst_decl): Copy TREE_ASM_WRITTEN for VAR_DECLs. + + * decl2.c (finish_vtable_vardecl): Don't prune vtables here. + 1999-11-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * decl.c (pushdecl, grokdeclarator): Don't call a variadic diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 21b2d44..617d854 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -2608,7 +2608,6 @@ finish_vtable_vardecl (t, data) /* We don't know what to do with this one yet. */ return 0; - *t = TREE_CHAIN (vars); return 0; } diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 18307b3..dde6562 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5913,6 +5913,11 @@ tsubst_decl (t, args, type, in_decl) TREE_TYPE (r) = TREE_TYPE (DECL_INITIAL (r)); } + /* If the template variable was marked TREE_ASM_WRITTEN, that + means we don't need to write out any of the instantiations + either. (__FUNCTION__ and its ilk are marked thusly.) */ + TREE_ASM_WRITTEN (r) = TREE_ASM_WRITTEN (t); + /* Even if the original location is out of scope, the newly substituted one is not. */ if (TREE_CODE (r) == VAR_DECL) diff --git a/gcc/testsuite/g++.old-deja/g++.pt/inline1.C b/gcc/testsuite/g++.old-deja/g++.pt/inline1.C new file mode 100644 index 0000000..343cd67 --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.pt/inline1.C @@ -0,0 +1,14 @@ +// Build don't link: +// Special g++ Options: -O2 -Winline +// Origin: Mark Mitchell <mark@codesourcery.com> + +template <class T> +inline void f () +{ + +} + +void g () +{ + f<int> (); +} |