diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-15 20:10:04 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-15 20:10:04 +0000 |
| commit | 438ee47fa49f415baa8e6e9aea8d697aff121c93 (patch) | |
| tree | 3519298958c5b72ad7fd278d9325609ae878f932 /gcc/cp/mangle.c | |
| parent | a50f08393c40a888a5d8786b289e3c63cd0cc7c3 (diff) | |
| download | gcc-438ee47fa49f415baa8e6e9aea8d697aff121c93.tar.gz | |
2011-07-15 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 176319 using svnmerge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@176330 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/mangle.c')
| -rw-r--r-- | gcc/cp/mangle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 81b772f6316..4a83c9adb2e 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3106,11 +3106,11 @@ mangle_decl_string (const tree decl) if (DECL_LANG_SPECIFIC (decl) && DECL_USE_TEMPLATE (decl)) { struct tinst_level *tl = current_instantiation (); - if (!tl || tl->decl != decl) + if ((!tl || tl->decl != decl) + && push_tinst_level (decl)) { template_p = true; saved_fn = current_function_decl; - push_tinst_level (decl); current_function_decl = NULL_TREE; } } |