diff options
| author | Jason Merrill <jason@redhat.com> | 2010-09-21 19:40:30 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-09-21 19:40:30 -0400 |
| commit | 6b9d99803efb6d8129cd8272b8065817c5a87e79 (patch) | |
| tree | 1a114878ab3fbcfee3d4716f53b157b8a7eca338 /gcc | |
| parent | a82e045dea91ea5a78f65fcaf6422cf0ea034c26 (diff) | |
| download | gcc-6b9d99803efb6d8129cd8272b8065817c5a87e79.zip gcc-6b9d99803efb6d8129cd8272b8065817c5a87e79.tar.gz gcc-6b9d99803efb6d8129cd8272b8065817c5a87e79.tar.bz2 | |
mangle.c (write_expression): Only do -fabi-version=1 special handling if we know the member.
* mangle.c (write_expression) [SCOPE_REF]: Only do -fabi-version=1
special handling if we know the member.
From-SVN: r164502
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cedf531..3994a3a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-21 Jason Merrill <jason@redhat.com> + + * mangle.c (write_expression) [SCOPE_REF]: Only do -fabi-version=1 + special handling if we know the member. + 2010-09-18 Jason Merrill <jason@redhat.com> * call.c (compare_ics): Do lvalue/rvalue reference binding diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 03e2837..39001c5 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -2491,7 +2491,7 @@ write_expression (tree expr) tree scope = TREE_OPERAND (expr, 0); tree member = TREE_OPERAND (expr, 1); - if (!abi_version_at_least (2)) + if (!abi_version_at_least (2) && DECL_P (member)) { write_string ("sr"); write_type (scope); |