From 1891a7220dbc3cc5d6432dfde0a405ec50b5ca11 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 14 May 2024 11:11:39 -0600
Subject: [PATCH] [instancer/CFF2] Fixups

---
 Lib/fontTools/cffLib/__init__.py           |  3 ---
 Lib/fontTools/varLib/instancer/__init__.py | 10 ++++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Lib/fontTools/cffLib/__init__.py b/Lib/fontTools/cffLib/__init__.py
index 260f71d20..f1e78d24d 100644
--- a/Lib/fontTools/cffLib/__init__.py
+++ b/Lib/fontTools/cffLib/__init__.py
@@ -2132,9 +2132,6 @@ class FDSelectCompiler(object):
 class VarStoreCompiler(object):
     def __init__(self, varStoreData, parent):
         self.parent = parent
-        if varStoreData is None:
-            self.data = b""
-            return
         if not varStoreData.data:
             varStoreData.compile()
         data = [packCard16(len(varStoreData.data)), varStoreData.data]
diff --git a/Lib/fontTools/varLib/instancer/__init__.py b/Lib/fontTools/varLib/instancer/__init__.py
index 02aa1fa11..bc6b25867 100644
--- a/Lib/fontTools/varLib/instancer/__init__.py
+++ b/Lib/fontTools/varLib/instancer/__init__.py
@@ -593,9 +593,7 @@ def instantiateCFF2(
     )  # Who knows why it's in two places?!
 
     def getNumRegions(vsindex):
-        return len(
-            varStore.VarData[vsindex if vsindex is not None else 0].VarRegionIndex
-        )
+        return varStore.VarData[vsindex if vsindex is not None else 0].VarRegionCount
 
     charStrings = topDict.CharStrings.values()
 
@@ -791,10 +789,10 @@ def instantiateCFF2(
 
     # Remove empty VarStore
     if not varStore.VarData:
-        topDict.VarStore = None
-        topDict.CharStrings.varStore = None
+        del topDict.VarStore
+        del topDict.CharStrings.varStore
         for private in privateDicts:
-            private.vstore = None
+            del private.vstore
 
 
 def _instantiateGvarGlyph(