deps: restore minimum ICU version to 65

This modifies 40df0dc so that the changes it applies are only used if ICU 67 or greater is used, and restores the previous code path for versions of ICU below 67. The minimum ICU version was bumped to 67 in Node.js 14.6.0 by #34356 but the referenced V8 commit[1] isn't on `v14.x-staging` and appears to have been reverted on V8 8.4[2] so this PR also restores the minimum ICU version to 65. [1] v8/v8@611e412 [2] v8/v8@eeccede PR-URL: #39068 Backport-PR-URL: #39451 Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com>

Author: richardlau

deps/v8/src/objects/js-list-format.cc

@@ -24,12 +24,58 @@
 #include "unicode/fpositer.h"
 #include "unicode/listformatter.h"
 #include "unicode/ulistformatter.h"
+#include "unicode/uvernum.h"
 
 namespace v8 {
 namespace internal {
 
 namespace {
 
+#if U_ICU_VERSION_MAJOR_NUM < 67
+const char* kStandard = "standard";
+const char* kOr = "or";
+const char* kUnit = "unit";
+const char* kStandardShort = "standard-short";
+const char* kOrShort = "or-short";
+const char* kUnitShort = "unit-short";
+const char* kStandardNarrow = "standard-narrow";
+const char* kOrNarrow = "or-narrow";
+const char* kUnitNarrow = "unit-narrow";
+
+const char* GetIcuStyleString(JSListFormat::Style style,
+ JSListFormat::Type type) {
+ switch (type) {
+ case JSListFormat::Type::CONJUNCTION:
+ switch (style) {
+ case JSListFormat::Style::LONG:
+ return kStandard;
+ case JSListFormat::Style::SHORT:
+ return kStandardShort;
+ case JSListFormat::Style::NARROW:
+ return kStandardNarrow;
+ }
+ case JSListFormat::Type::DISJUNCTION:
+ switch (style) {
+ case JSListFormat::Style::LONG:
+ return kOr;
+ case JSListFormat::Style::SHORT:
+ return kOrShort;
+ case JSListFormat::Style::NARROW:
+ return kOrNarrow;
+ }
+ case JSListFormat::Type::UNIT:
+ switch (style) {
+ case JSListFormat::Style::LONG:
+ return kUnit;
+ case JSListFormat::Style::SHORT:
+ return kUnitShort;
+ case JSListFormat::Style::NARROW:
+ return kUnitNarrow;
+ }
+ }
+ UNREACHABLE();
+}
+#else
 UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
  switch (style) {
  case JSListFormat::Style::LONG:
@@ -53,6 +99,7 @@ UListFormatterType GetIcuType(JSListFormat::Type type) {
  }
  UNREACHABLE();
 }
+#endif
 
 } // namespace
 
@@ -151,7 +198,11 @@ MaybeHandle<JSListFormat> JSListFormat::New(Isolate* isolate, Handle<Map> map,
  icu::Locale icu_locale = r.icu_locale;
  UErrorCode status = U_ZERO_ERROR;
  icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
+#if U_ICU_VERSION_MAJOR_NUM < 67
+ icu_locale, GetIcuStyleString(style_enum, type_enum), status);
+#else
  icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
+#endif
  if (U_FAILURE(status)) {
  delete formatter;
  FATAL("Failed to create ICU list formatter, are ICU data files missing?");