mangle.c (get_mangled_id): Factor from ...

	* mangle.c (get_mangled_id): Factor from ...
	(mangle_decl): ... here.
	Call get_mangled_id.

From-SVN: r180698

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 84d991d687b856eacafdf149f56455d68eddafc6..226c4198d0b7ea6e9c14057b6243579ca659d808 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-31   Diego Novillo  <dnovillo@google.com>
+
+       * mangle.c (get_mangled_id): Factor from ...
+       (mangle_decl): ... here.
+       Call get_mangled_id.
+
 2011-10-25  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * NEWS (GCC 2.95): Refer to GNU/Linux instead of Linux.

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 8bc26d8b34ff0c58207cdd43c47bf2319b72c514..69fe147f4802e98c133cf821d041647e00a1b4d1 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -3177,13 +3177,21 @@ mangle_decl_string (const tree decl)
   return result;
 }
 
+/* Return an identifier for the external mangled name of DECL.  */
+
+static tree
+get_mangled_id (tree decl)
+{
+  tree id = mangle_decl_string (decl);
+  return targetm.mangle_decl_assembler_name (decl, id);
+}
+
 /* Create an identifier for the external mangled name of DECL.  */
 
 void
 mangle_decl (const tree decl)
 {
-  tree id = mangle_decl_string (decl);
-  id = targetm.mangle_decl_assembler_name (decl, id);
+  tree id = get_mangled_id (decl);
   SET_DECL_ASSEMBLER_NAME (decl, id);
 
   if (G.need_abi_warning)