From b6959c33e23b464ddbe5fe98fafc80bbb669189c Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 29 May 2018 17:02:22 -0700
Subject: [PATCH] [map] Minor

---
 src/hb-map-private.hh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh
index 07d5d0dab..7611021a8 100644
--- a/src/hb-map-private.hh
+++ b/src/hb-map-private.hh
@@ -132,12 +132,11 @@ struct hb_map_t
       return; /* Trying to delete non-existent key. */
 
     /* Accounting. */
-    if (items[i].is_tombstone ())
-      occupancy--;
-    else if (!items[i].is_unused ())
+    if (!items[i].is_unused ())
     {
-      population--;
       occupancy--;
+      if (items[i].value != INVALID)
+	population--;
     }
     occupancy++;
     if (value != INVALID)