From 6b9d99803efb6d8129cd8272b8065817c5a87e79 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 21 Sep 2010 19:40:30 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/mangle.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cedf5312014..3994a3a4584 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-21 Jason Merrill + + * mangle.c (write_expression) [SCOPE_REF]: Only do -fabi-version=1 + special handling if we know the member. + 2010-09-18 Jason Merrill * call.c (compare_ics): Do lvalue/rvalue reference binding diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 03e28374810..39001c56a7d 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);