From 448acde3b4d5deb8cf78e2ce751b777d991ea5c4 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 7 Mar 2012 20:16:16 +0000
Subject: [PATCH] 	PR c++/52521 	* mangle.c
 (write_literal_operator_name): The length comes after the 	operator
 prefix.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@185077 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                          |  6 ++++++
 gcc/cp/mangle.c                           | 10 ++++------
 gcc/testsuite/ChangeLog                   |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C |  8 ++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6a92eeba555..b6c72fcf140 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/52521
+	* mangle.c (write_literal_operator_name): The length comes after the
+	operator prefix.
+
 2012-02-29  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51930
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 34f19efc42e..9c328b2ce55 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -1292,18 +1292,16 @@ write_source_name (tree identifier)
 }
 
 /* Write a user-defined literal operator.
+          ::= li <source-name>    # "" <source-name>
    IDENTIFIER is an LITERAL_IDENTIFIER_NODE.  */
 
 static void
 write_literal_operator_name (tree identifier)
 {
   const char* suffix = UDLIT_OP_SUFFIX (identifier);
-  char* buffer = XNEWVEC (char, strlen (UDLIT_OP_MANGLED_PREFIX)
-			      + strlen (suffix) + 10);
-  sprintf (buffer, UDLIT_OP_MANGLED_FORMAT, suffix);
-
-  write_unsigned_number (strlen (buffer));
-  write_identifier (buffer);
+  write_identifier (UDLIT_OP_MANGLED_PREFIX);
+  write_unsigned_number (strlen (suffix));
+  write_identifier (suffix);
 }
 
 /* Encode 0 as _, and 1+ as n-1_.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4ffc13bedb4..0f56e01d32a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/52521
+	* g++.dg/cpp0x/udlit-mangle.C: New.
+
 2012-03-04  Georg-Johann Lay  <avr@gjlay.de>
 
 	Backport from mainline r184894.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C b/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C
new file mode 100644
index 00000000000..6de31b65ea7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C
@@ -0,0 +1,8 @@
+// PR c++/52521
+// { dg-options -std=c++0x }
+// { dg-final { scan-assembler "_Zli2_wPKc" } }
+
+int operator "" _w(const char*);
+int main() {
+  123_w;
+}
-- 
2.11.0