Changeset 243397 in webkit

Timestamp:

Mar 22, 2019, 12:07:35 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r243311. rdar://problem/49113565

[JSC] Fix JSC build with newer ICU
​https://bugs.webkit.org/show_bug.cgi?id=196098

Reviewed by Keith Miller.

IntlDateTimeFormat and IntlNumberFormat have switch statement over ICU's enums. However it lacks "default" clause so that
the compile error occurs when a new enum value is added in ICU side. We should have "default" clause which just fallbacks
"unknown"_s case. The behavior is not changed since we already have return "unknown"_s; statement anyway after the
switch statement. This patch just suppresses a compile error.

• runtime/IntlDateTimeFormat.cpp: (JSC::IntlDateTimeFormat::partTypeString):
• runtime/IntlNumberFormat.cpp: (JSC::IntlNumberFormat::partTypeString):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@243311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

tags/Safari-608.1.11.1/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/IntlDateTimeFormat.cpp (modified) (1 diff)
• runtime/IntlNumberFormat.cpp (modified) (1 diff)

tags/Safari-608.1.11.1/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-03-22  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r243311. rdar://problem/49113565
+
+    [JSC] Fix JSC build with newer ICU
+    https://bugs.webkit.org/show_bug.cgi?id=196098
+    
+    Reviewed by Keith Miller.
+    
+    IntlDateTimeFormat and IntlNumberFormat have switch statement over ICU's enums. However it lacks "default" clause so that
+    the compile error occurs when a new enum value is added in ICU side. We should have "default" clause which just fallbacks
+    "unknown"_s case. The behavior is not changed since we already have `return "unknown"_s;` statement anyway after the
+    switch statement. This patch just suppresses a compile error.
+    
+    * runtime/IntlDateTimeFormat.cpp:
+    (JSC::IntlDateTimeFormat::partTypeString):
+    * runtime/IntlNumberFormat.cpp:
+    (JSC::IntlNumberFormat::partTypeString):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243311 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            [JSC] Fix JSC build with newer ICU
+            https://bugs.webkit.org/show_bug.cgi?id=196098
+
+            Reviewed by Keith Miller.
+
+            IntlDateTimeFormat and IntlNumberFormat have switch statement over ICU's enums. However it lacks "default" clause so that
+            the compile error occurs when a new enum value is added in ICU side. We should have "default" clause which just fallbacks
+            "unknown"_s case. The behavior is not changed since we already have `return "unknown"_s;` statement anyway after the
+            switch statement. This patch just suppresses a compile error.
+
+            * runtime/IntlDateTimeFormat.cpp:
+            (JSC::IntlDateTimeFormat::partTypeString):
+            * runtime/IntlNumberFormat.cpp:
+            (JSC::IntlNumberFormat::partTypeString):
+
 2019-03-19  Devin Rousso  <drousso@apple.com>
 

tags/Safari-608.1.11.1/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp

@@ -978 +978 @@
     case UDAT_FIELD_COUNT:
 #endif
+    // Any newer additions to the UDateFormatField enum should just be considered an "unknown" part.
+    default:
         return "unknown"_s;
     }
-    // Any newer additions to the UDateFormatField enum should just be considered an "unknown" part.
     return "unknown"_s;
 }

tags/Safari-608.1.11.1/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp

@@ -477 +477 @@
     case UNUM_FIELD_COUNT:
 #endif
+    // Any newer additions to the UNumberFormatFields enum should just be considered an "unknown" part.
+    default:
         return "unknown"_s;
     }
-    // Any newer additions to the UNumberFormatFields enum should just be considered an "unknown" part.
     return "unknown"_s;
 }