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

+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

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);