Optimize UnicodeICU localeCompare

facebook · Nov 10, 2023 · d9adb66 · d9adb66
1 parent 84732b3
commit d9adb66
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/lib/Platform/Unicode/PlatformUnicodeICU.cpp b/lib/Platform/Unicode/PlatformUnicodeICU.cpp
@@ -13,12 +13,21 @@
 
 #include <time.h>
 
+#include <memory>
+
 namespace hermes {
 namespace platform_unicode {
 
-int localeCompare(
-    llvh::ArrayRef<char16_t> left,
-    llvh::ArrayRef<char16_t> right) {
+namespace {
+struct UCollatorDeleter {
+  void operator()(UCollator *coll) {
+    if (coll) {
+      ucol_close(coll);
+    }
+  }
+};
+
+std::unique_ptr<UCollator, UCollatorDeleter> openUCollator() {
   UErrorCode err{U_ZERO_ERROR};
   UCollator *coll = ucol_open(uloc_getDefault(), &err);
   if (U_FAILURE(err)) {
@@ -32,16 +41,22 @@ int localeCompare(
   // in two different ways to compare as equal.
   ucol_setAttribute(coll, UCOL_NORMALIZATION_MODE, UCOL_ON, &err);
   assert(U_SUCCESS(err) && "failed to set collator attribute");
+  return std::unique_ptr<UCollator, UCollatorDeleter>(coll, UCollatorDeleter());
+}
+} // namespace
+
+int localeCompare(
+    llvh::ArrayRef<char16_t> left,
+    llvh::ArrayRef<char16_t> right) {
+  static auto coll = openUCollator();
 
   auto result = ucol_strcoll(
-      coll,
+      coll.get(),
       (const UChar *)left.data(),
       left.size(),
       (const UChar *)right.data(),
       right.size());
 
-  ucol_close(coll);
-
   switch (result) {
     case UCOL_LESS:
       return -1;