ICU-11761 stringSet strings are unique

X-SVN-Rev: 37656

diff --git a/icu4c/source/tools/genrb/reslist.cpp b/icu4c/source/tools/genrb/reslist.cpp
index 1b24863767c1d3404fcab5ec97abfa0a5e314b98..627d4e72cdc6781d176052cdd6661d6ad4b075f5 100644 (file)
--- a/icu4c/source/tools/genrb/reslist.cpp
+++ b/icu4c/source/tools/genrb/reslist.cpp
@@ -1400,6 +1400,9 @@ SRBRoot::compactStringsV2(UHashtable *stringSet, UErrorCode &errorCode) {
     if (U_FAILURE(errorCode)) {
         return;
     }
+    // Store the StringResource pointers in an array for
+    // easy sorting and processing.
+    // We enumerate a set of strings, so there are no duplicates.
     int32_t count = uhash_count(stringSet);
     LocalArray<StringResource *> array(new StringResource *[count], errorCode);
     if (U_FAILURE(errorCode)) {
@@ -1431,7 +1434,8 @@ SRBRoot::compactStringsV2(UHashtable *stringSet, UErrorCode &errorCode) {
             StringResource *suffixRes = array[j];
             /* Is it a suffix of the earlier, longer string? */
             if (res->fString.endsWith(suffixRes->fString)) {
-                if (suffixRes->fNumCharsForLength == 0 || res->length() == suffixRes->length()) {
+                assert(res->length() != suffixRes->length());  // Set strings are unique.
+                if (suffixRes->fNumCharsForLength == 0) {
                     /* yes, point to the earlier string */
                     suffixRes->fSame = res;
                     suffixRes->fSuffixOffset = res->length() - suffixRes->length();
@@ -1467,11 +1471,8 @@ SRBRoot::compactStringsV2(UHashtable *stringSet, UErrorCode &errorCode) {
     for (; i < count; ++i) {
         StringResource *res = array[i];
         StringResource *same = res->fSame;
-        if (res->length() == same->length()) {
-            res->fRes = same->fRes;
-        } else {
-            res->fRes = same->fRes + same->fNumCharsForLength + res->fSuffixOffset;
-        }
+        assert(res->length() != same->length());  // Set strings are unique.
+        res->fRes = same->fRes + same->fNumCharsForLength + res->fSuffixOffset;
         res->fSame = NULL;
         res->fWritten = TRUE;
     }