From afae537c3ca4d2ddae2b8bee400966a08bf74e6e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 29 Jun 2023 12:42:44 -0600
Subject: [PATCH] [cache] Minor remove .init()

Use constructor.
---
 src/hb-cache.hh   | 4 +---
 src/hb-ft.cc      | 2 +-
 src/hb-ot-font.cc | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/hb-cache.hh b/src/hb-cache.hh
index 8371465c6..aade553d6 100644
--- a/src/hb-cache.hh
+++ b/src/hb-cache.hh
@@ -62,9 +62,7 @@ struct hb_cache_t
   static_assert ((key_bits >= cache_bits), "");
   static_assert ((key_bits + value_bits <= cache_bits + 8 * sizeof (item_t)), "");
 
-  hb_cache_t () { init (); }
-
-  void init () { clear (); }
+  hb_cache_t () { clear (); }
 
   void clear ()
   {
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 1105862fb..6ca3f8546 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -114,7 +114,7 @@ _hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref)
   ft_font->load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
 
   ft_font->cached_serial = (unsigned) -1;
-  ft_font->advance_cache.init ();
+  new (&ft_font->advance_cache) hb_ft_advance_cache_t;
 
   return ft_font;
 }
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index c89a1954a..0b4641b5b 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -98,7 +98,7 @@ _hb_ot_font_create (hb_font_t *font)
   {
     cmap_cache = (hb_ot_font_cmap_cache_t *) hb_malloc (sizeof (hb_ot_font_cmap_cache_t));
     if (unlikely (!cmap_cache)) goto out;
-    cmap_cache->init ();
+    new (cmap_cache) hb_ot_font_cmap_cache_t ();
     if (unlikely (!hb_face_set_user_data (font->face,
 					  &hb_ot_font_cmap_cache_user_data_key,
 					  cmap_cache,
@@ -230,8 +230,8 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
 	use_cache = false;
 	goto out;
       }
+      new (cache) hb_ot_font_advance_cache_t;
 
-      cache->init ();
       if (unlikely (!ot_font->advance_cache.cmpexch (nullptr, cache)))
       {
 	hb_free (cache);
@@ -255,7 +255,7 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
   { /* Use cache. */
     if (ot_font->cached_coords_serial.get_acquire () != (int) font->serial_coords)
     {
-      ot_font->advance_cache->init ();
+      ot_font->advance_cache->clear ();
       ot_font->cached_coords_serial.set_release (font->serial_coords);
     }