From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [patch] libstdc++/66855 ignore endianness in codecvt_utf8_utf16
Date: Mon, 13 Jul 2015 20:10:00 -0000 [thread overview]
Message-ID: <20150713200957.GC21787@redhat.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
This facet is not meant to pay attention to mode|little_endian, so
explicitly override the value to output with the target's native
endianness.
Tested powerpc64-linux and powerp64le-linux, committed to trunk.
I'll commit it to the gcc-5-branch after the 5.2 release.
[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 2919 bytes --]
commit e35e03773955a618cba43fcef4b1559ba9a27d8c
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Mon Jul 13 19:38:58 2015 +0100
PR libstdc++/66855
* src/c++11/codecvt.cc (__codecvt_utf8_utf16_base::do_in): Override
endianness bit in mode.
* testsuite/22_locale/codecvt/codecvt_utf8_utf16/66855.cc: New.
diff --git a/libstdc++-v3/src/c++11/codecvt.cc b/libstdc++-v3/src/c++11/codecvt.cc
index 6b82aa8..a454064 100644
--- a/libstdc++-v3/src/c++11/codecvt.cc
+++ b/libstdc++-v3/src/c++11/codecvt.cc
@@ -1264,7 +1264,11 @@ do_in(state_type&, const extern_type* __from, const extern_type* __from_end,
{
range<const char> from{ __from, __from_end };
range<char16_t> to{ __to, __to_end };
- auto res = utf16_in(from, to, _M_maxcode, _M_mode);
+ codecvt_mode mode = codecvt_mode(_M_mode | (consume_header|generate_header));
+#if __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
+ mode = codecvt_mode(mode | little_endian);
+#endif
+ auto res = utf16_in(from, to, _M_maxcode, mode);
__from_next = from.next;
__to_next = to.next;
return res;
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/66855.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/66855.cc
new file mode 100644
index 0000000..3f99cb4
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/66855.cc
@@ -0,0 +1,52 @@
+// Copyright (C) 2015 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++11" }
+
+#include <codecvt>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+ std::codecvt_utf8_utf16<char16_t> cvt;
+ char16_t utf16[] = u"\ub098\ub294\ud0dc\uc624";
+ const char16_t* nf16;
+ char utf8[16];
+ char* nt8;
+ std::mbstate_t st{};
+ auto res = cvt.out(st, utf16, utf16+4, nf16, utf8, utf8+16, nt8);
+ VERIFY( res == std::codecvt_base::ok );
+
+ st = {};
+ char16_t buf[4] = {};
+ const char* nf8 = nt8;
+ char16_t* nt16;
+ res = cvt.in(st, utf8, nf8, nf8, buf, buf+4, nt16);
+ VERIFY( res == std::codecvt_base::ok );
+ VERIFY( nt16 == buf+4 );
+ VERIFY( buf[0] == utf16[0] );
+ VERIFY( buf[1] == utf16[1] );
+ VERIFY( buf[2] == utf16[2] );
+ VERIFY( buf[3] == utf16[3] );
+}
+
+int
+main()
+{
+ test01();
+}
reply other threads:[~2015-07-13 20:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150713200957.GC21787@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).