diff options
| author | Jason Merrill <jason@redhat.com> | 2012-03-03 19:55:38 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-03-03 19:55:38 -0500 |
| commit | dd94dde78316a27e0028759abbca126fb0fd037f (patch) | |
| tree | c97182edb911ab6398f55d7b43297872d4741a25 | |
| parent | 77d4d7c577db67e9c831d4aab154549f8e96fe3b (diff) | |
| download | gcc-dd94dde78316a27e0028759abbca126fb0fd037f.zip gcc-dd94dde78316a27e0028759abbca126fb0fd037f.tar.gz gcc-dd94dde78316a27e0028759abbca126fb0fd037f.tar.bz2 | |
mangle.c (write_nested_name): Use decl_mangling_context.
* mangle.c (write_nested_name): Use decl_mangling_context.
(write_prefix, write_template_prefix): Likewise.
From-SVN: r184875
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af3434d..df39779 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2012-03-03 Jason Merrill <jason@redhat.com> + * mangle.c (write_nested_name): Use decl_mangling_context. + (write_prefix, write_template_prefix): Likewise. + PR c++/36797 * mangle.c (write_expression): Improve diagnostic for TRAIT_EXPR. diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 04f4344..1379e3b 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -942,7 +942,7 @@ write_nested_name (const tree decl) } else { - write_prefix (CP_DECL_CONTEXT (decl)); + write_prefix (decl_mangling_context (decl)); write_unqualified_name (decl); } } @@ -1030,7 +1030,7 @@ write_prefix (const tree node) } else { - write_prefix (CP_DECL_CONTEXT (decl)); + write_prefix (decl_mangling_context (decl)); write_unqualified_name (decl); } } @@ -1060,7 +1060,7 @@ write_template_prefix (const tree node) { tree decl = DECL_P (node) ? node : TYPE_NAME (node); tree type = DECL_P (node) ? TREE_TYPE (node) : node; - tree context = CP_DECL_CONTEXT (decl); + tree context = decl_mangling_context (decl); tree template_info; tree templ; tree substitution; |