diff options
| author | Ed Smith-Rowland <3dw4rd@verizon.net> | 2011-11-04 16:16:09 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-11-04 12:16:09 -0400 |
| commit | 2fcc5e64740e48417e93d986bd58595296bec0c5 (patch) | |
| tree | 57771229eb2fcfa0d5cd79ba055b358a7593cf85 | |
| parent | b6d185a56cbc3859f71b282287acc293026c9308 (diff) | |
| download | gcc-2fcc5e64740e48417e93d986bd58595296bec0c5.zip gcc-2fcc5e64740e48417e93d986bd58595296bec0c5.tar.gz gcc-2fcc5e64740e48417e93d986bd58595296bec0c5.tar.bz2 | |
re PR c++/50941 ([C++0x] user-defined string literals provide incorrect length for wchar_t, char16_t, and char32_t)
PR c++/50941
* parser.c (cp_parser_userdef_string_literal): Fix string length.
From-SVN: r180961
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C | 46 |
4 files changed, 58 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6f9d3c9..01d2f91 100644 --- 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 e543e87..811b2fa 100644 --- 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 3fe3989..02f400e 100644 --- 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 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"); |