From 449f6df7622c2e363841823c92ca5fd4faee9d62 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 12 Jan 2023 14:52:00 -0700
Subject: [PATCH] [mutex] Add constructor/destructor

Use in one place.
---
 src/hb-mutex.hh              | 3 +++
 src/hb-subset-accelerator.hh | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/hb-mutex.hh b/src/hb-mutex.hh
index 053f9ddcc..2224be87a 100644
--- a/src/hb-mutex.hh
+++ b/src/hb-mutex.hh
@@ -97,6 +97,9 @@ struct hb_mutex_t
   /* Create space for, but do not initialize m. */
   alignas(hb_mutex_impl_t) char m[sizeof (hb_mutex_impl_t)];
 
+  hb_mutex_t () { init (); }
+  ~hb_mutex_t () { fini (); }
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
   void init   () { hb_mutex_impl_init   ((hb_mutex_impl_t *) m); }
diff --git a/src/hb-subset-accelerator.hh b/src/hb-subset-accelerator.hh
index 577ff223e..e523c2582 100644
--- a/src/hb-subset-accelerator.hh
+++ b/src/hb-subset-accelerator.hh
@@ -88,10 +88,7 @@ struct hb_subset_accelerator_t
     destroy_cmap_cache(nullptr),
     has_seac(has_seac_),
     cff_accelerator(nullptr),
-    destroy_cff_accelerator(nullptr)
-  {
-    sanitized_table_cache_lock.init ();
-  }
+    destroy_cff_accelerator(nullptr) {}
 
   ~hb_subset_accelerator_t ()
   {
@@ -100,8 +97,6 @@ struct hb_subset_accelerator_t
 
     if (cmap_cache && destroy_cmap_cache)
       destroy_cmap_cache ((void*) cmap_cache);
-
-    sanitized_table_cache_lock.fini ();
   }
 
   // Generic