re PR c++/50941 ([C++0x] user-defined string literals provide incorrect length for...

	PR c++/50941
	* parser.c (cp_parser_userdef_string_literal): Fix string length.

From-SVN: r180961

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6f9d3c951c000a0993eaa5758e6e1bc6e45dbc80..01d2f91a3b682bd754a99ce2ec89eb31d2831a86 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Ed Smith-Rowland  <3dw4rd@verizon.net>
+
+       PR c++/50941
+       * parser.c (cp_parser_userdef_string_literal): Fix string length.
+
 2011-11-04  Jason Merrill  <jason@redhat.com>
 
        PR c++/48370

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e543e870550c4bdde4b0071d3b6bc6eb51308a51..811b2faf32e0f0f0dafeb06c987c4e98b8fecd3f 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3681,8 +3681,8 @@ cp_parser_userdef_string_literal (cp_token *token)
   suffix_id = USERDEF_LITERAL_SUFFIX_ID (literal);
   name = cp_literal_operator_id (IDENTIFIER_POINTER (suffix_id));
   value = USERDEF_LITERAL_VALUE (literal);
-  len = TREE_STRING_LENGTH (value) - 1;
-
+  len = TREE_STRING_LENGTH (value)
+       / TREE_INT_CST_LOW (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (value)))) - 1;
   /* Build up a call to the user-defined operator  */
   /* Lookup the name we got back from the id-expression.  */
   vec = make_tree_vector ();

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3fe39899c27744bd6c3a21f386597e524cb575a0..02f400e6571b31081335857b9dcb769c2508714d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Ed Smith-Rowland  <3dw4rd@verizon.net>
+
+       PR c++/50941
+       * g++.dg/cpp0x/udlit-strint-length.C: New.
+
 2011-11-04  Jason Merrill  <jason@redhat.com>
 
        PR c++/48370

diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C b/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C
new file mode 100644 (file)
index 0000000..86903e8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C
@@ -0,0 +1,46 @@
+// { dg-options "-std=c++0x" }
+// PR c++/50941
+
+typedef decltype(sizeof(0)) size_type;
+
+constexpr size_type
+operator"" _len(const char*, size_type len)
+{
+  return len;
+}
+
+constexpr size_type
+operator"" _len(const wchar_t*, size_type len)
+{
+  return len;
+}
+
+constexpr size_type
+operator"" _len(const char16_t*, size_type len)
+{
+  return len;
+}
+
+constexpr size_type
+operator"" _len(const char32_t*, size_type len)
+{
+  return len;
+}
+
+static_assert(  ""_len == 0, "Ouch");
+static_assert(u8""_len == 0, "Ouch");
+static_assert( L""_len == 0, "Ouch");
+static_assert( u""_len == 0, "Ouch");
+static_assert( U""_len == 0, "Ouch");
+
+static_assert(  "1"_len == 1, "Ouch");
+static_assert(u8"1"_len == 1, "Ouch");
+static_assert( L"1"_len == 1, "Ouch");
+static_assert( u"1"_len == 1, "Ouch");
+static_assert( U"1"_len == 1, "Ouch");
+
+static_assert(  "123"_len == 3, "Ouch");
+static_assert(u8"123"_len == 3, "Ouch");
+static_assert( L"123"_len == 3, "Ouch");
+static_assert( u"123"_len == 3, "Ouch");
+static_assert( U"123"_len == 3, "Ouch");