1 files changed, 22 insertions, 6 deletions

diff --git a/deps/icu-small/source/i18n/number_integerwidth.cpp b/deps/icu-small/source/i18n/number_integerwidth.cpp
index 4a612273f5..6416b29298 100644
--- a/deps/icu-small/source/i18n/number_integerwidth.cpp
+++ b/deps/icu-small/source/i18n/number_integerwidth.cpp
@@ -3,7 +3,7 @@
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_FORMATTING && !UPRV_INCOMPLETE_CPP11_SUPPORT
+#if !UCONFIG_NO_FORMATTING
 
 #include "unicode/numberformatter.h"
 #include "number_types.h"
@@ -13,14 +13,15 @@ using namespace icu;
 using namespace icu::number;
 using namespace icu::number::impl;
 
-IntegerWidth::IntegerWidth(digits_t minInt, digits_t maxInt) {
+IntegerWidth::IntegerWidth(digits_t minInt, digits_t maxInt, bool formatFailIfMoreThanMaxDigits) {
     fUnion.minMaxInt.fMinInt = minInt;
     fUnion.minMaxInt.fMaxInt = maxInt;
+    fUnion.minMaxInt.fFormatFailIfMoreThanMaxDigits = formatFailIfMoreThanMaxDigits;
 }
 
 IntegerWidth IntegerWidth::zeroFillTo(int32_t minInt) {
     if (minInt >= 0 && minInt <= kMaxIntFracSig) {
-        return {static_cast<digits_t>(minInt), -1};
+        return {static_cast<digits_t>(minInt), -1, false};
     } else {
         return {U_NUMBER_ARG_OUTOFBOUNDS_ERROR};
     }
@@ -30,22 +31,37 @@ IntegerWidth IntegerWidth::truncateAt(int32_t maxInt) {
     if (fHasError) { return *this; }  // No-op on error
     digits_t minInt = fUnion.minMaxInt.fMinInt;
     if (maxInt >= 0 && maxInt <= kMaxIntFracSig && minInt <= maxInt) {
-        return {minInt, static_cast<digits_t>(maxInt)};
+        return {minInt, static_cast<digits_t>(maxInt), false};
     } else if (maxInt == -1) {
-        return {minInt, -1};
+        return {minInt, -1, false};
     } else {
         return {U_NUMBER_ARG_OUTOFBOUNDS_ERROR};
     }
 }
 
-void IntegerWidth::apply(impl::DecimalQuantity &quantity, UErrorCode &status) const {
+void IntegerWidth::apply(impl::DecimalQuantity& quantity, UErrorCode& status) const {
     if (fHasError) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
     } else if (fUnion.minMaxInt.fMaxInt == -1) {
         quantity.setIntegerLength(fUnion.minMaxInt.fMinInt, INT32_MAX);
     } else {
+        // Enforce the backwards-compatibility feature "FormatFailIfMoreThanMaxDigits"
+        if (fUnion.minMaxInt.fFormatFailIfMoreThanMaxDigits &&
+            fUnion.minMaxInt.fMaxInt < quantity.getMagnitude()) {
+            status = U_ILLEGAL_ARGUMENT_ERROR;
+        }
         quantity.setIntegerLength(fUnion.minMaxInt.fMinInt, fUnion.minMaxInt.fMaxInt);
     }
 }
 
+bool IntegerWidth::operator==(const IntegerWidth& other) const {
+    // Private operator==; do error and bogus checking first!
+    U_ASSERT(!fHasError);
+    U_ASSERT(!other.fHasError);
+    U_ASSERT(!isBogus());
+    U_ASSERT(!other.isBogus());
+    return fUnion.minMaxInt.fMinInt == other.fUnion.minMaxInt.fMinInt &&
+           fUnion.minMaxInt.fMaxInt == other.fUnion.minMaxInt.fMaxInt;
+}
+
 #endif /* #if !UCONFIG_NO_FORMATTING */