commit 141884a85c063be47c6b37e5cf79e4c362f11155
author Peter Edberg <pedberg@unicode.org> Tue Aug 27 21:29:51 2019 -0700
committer pedberg-icu <42151464+pedberg-icu@users.noreply.github.com> Tue Aug 27 23:23:36 2019 -0700
tree 02e1c9063a8394fcba771f6a62d85cbd10931c9a
parent 4b6eb7236a6ad83bc5f39a29b6ca95204c1060f4

ICU-20680 revert use of UPRV_UNREACHABLE in places actually reached in production code

icu4c/source/common/uinvchar.cpp

diff --git a/icu4c/source/common/uinvchar.cpp b/icu4c/source/common/uinvchar.cpp
index 6e5fb48..05bcf10 100644
--- a/icu4c/source/common/uinvchar.cpp
+++ b/icu4c/source/common/uinvchar.cpp
@@ -207,7 +207,8 @@
     while(length>0) {
         u=*us++;
         if(!UCHAR_IS_INVARIANT(u)) {
-            UPRV_UNREACHABLE; /* Variant characters were used. These are not portable in ICU. */
+            U_ASSERT(FALSE); /* Variant characters were used. These are not portable in ICU. */
+            u=0;
         }
         *cs++=(char)UCHAR_TO_CHAR(u);
         --length;

icu4c/source/i18n/usearch.cpp

diff --git a/icu4c/source/i18n/usearch.cpp b/icu4c/source/i18n/usearch.cpp
index 1fc6e13..1baec3d 100644
--- a/icu4c/source/i18n/usearch.cpp
+++ b/icu4c/source/i18n/usearch.cpp
@@ -3544,7 +3544,8 @@
     //   Verify that it is the next one in sequence, which is all
     //   that is allowed.
     if (index != limitIx) {
-        UPRV_UNREACHABLE;
+        U_ASSERT(FALSE);
+        return NULL;
     }
 
     // Manage the circular CE buffer indexing
@@ -3581,7 +3582,8 @@
     //   Verify that it is the next one in sequence, which is all
     //   that is allowed.
     if (index != limitIx) {
-        UPRV_UNREACHABLE;
+        U_ASSERT(FALSE);
+        return NULL;
     }
 
     // Manage the circular CE buffer indexing