From 39fb57c0e456ec352b2d0a6e6dc61b9bdee85665 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Sun, 16 Feb 2020 08:38:41 -0800
Subject: [PATCH] add share option to pop_pack() (#2176)

as a solution for #2164
---
 src/hb-serialize.hh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/hb-serialize.hh b/src/hb-serialize.hh
index 6e18dc95f..3e419d768 100644
--- a/src/hb-serialize.hh
+++ b/src/hb-serialize.hh
@@ -195,7 +195,12 @@ struct hb_serialize_context_t
     obj->fini ();
     object_pool.free (obj);
   }
-  objidx_t pop_pack ()
+
+  /* Set share to false when an object is unlikely sharable with others
+   * so not worth an attempt, or a contiguous table is serialized as
+   * multiple consecutive objects in the reverse order so can't be shared.
+   */
+  objidx_t pop_pack (bool share=true)
   {
     object_t *obj = current;
     if (unlikely (!obj)) return 0;
@@ -211,11 +216,15 @@ struct hb_serialize_context_t
       return 0;
     }
 
-    objidx_t objidx = packed_map.get (obj);
-    if (objidx)
+    objidx_t objidx;
+    if (share)
     {
-      obj->fini ();
-      return objidx;
+      objidx = packed_map.get (obj);
+      if (objidx)
+      {
+	obj->fini ();
+	return objidx;
+      }
     }
 
     tail -= len;
@@ -231,7 +240,7 @@ struct hb_serialize_context_t
 
     objidx = packed.length - 1;
 
-    packed_map.set (obj, objidx);
+    if (share) packed_map.set (obj, objidx);
 
     return objidx;
   }