Attachment 359023 Details for Bug 193332 – Patch for landing

[patch] Patch for landing

bug-193332-20190114102055.patch (text/plain), 2.20 KB, created by Charlie Turner on 2019-01-14 02:20:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Turner

Created: 2019-01-14 02:20:56 PST

Size: 2.20 KB

patch

obsolete

>Subversion Revision: 239917
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a12bffa69a65f1f583734289cc75d3e3491fa4a3..22e5516f4b1b5f527d9af94be0a479b994d4937f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-01-14  Charlie Turner  <cturner@igalia.com>
>+
>+        [WPE] Workaround for incorrect template specialization being selected when UChar=char16_t
>+        https://bugs.webkit.org/show_bug.cgi?id=193332
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * TestWebKitAPI/Tests/WTF/StringConcatenate.cpp: When UChar is
>+        defined as a char16_t, which changed in ICU 59, the
>+        StringTypeAdapter<UnsignedInt, ...> overload catches casts to
>+        unsigned short. This test is relying on the behaviour that
>+        UChar=unsigned short, which doesn't hold across platforms and ICU
>+        library versions. The full fix would be a special syntax for
>+        literal characters so that these ambiguities do not arise. That
>+        work is proposed in https://bugs.webkit.org/show_bug.cgi?id=193101.
>+        (TestWebKitAPI::TEST):
>+
> 2019-01-14  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. [GTK][WPE] Run distcheck with gtkdoc and MiniBrowser enabled
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp
>index 388b30e3086fc3e1a58b9dc1f9a24494e7aaa5dd..ee7004a4f5979c9891d4eded97345dce0c42033d 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp
>@@ -30,6 +30,7 @@
> #include <wtf/text/StringConcatenateNumbers.h>
> #include <cstddef>
> #include <cstdint>
>+#include <unicode/uvernum.h>
> 
> namespace TestWebKitAPI {
> 
>@@ -81,7 +82,7 @@ TEST(WTF, StringConcatenate_Unsigned)
>     EXPECT_EQ("hello 0 world", makeString("hello ", 0u , " world"));
> 
>     EXPECT_EQ("hello 42 world", makeString("hello ", static_cast<unsigned char>(42) , " world"));
>-#if PLATFORM(WIN)
>+#if PLATFORM(WIN) || U_ICU_VERSION_MAJOR_NUM >= 59
>     EXPECT_EQ("hello 42 world", makeString("hello ", static_cast<unsigned short>(42) , " world"));
> #else
>     EXPECT_EQ("hello * world", makeString("hello ", static_cast<unsigned short>(42) , " world")); // Treated as a character.

Actions: View | Formatted Diff | Diff

Attachments on bug 193332: 358821 | 359023