diff --git a/Lib/fontTools/varLib/instancer/__init__.py b/Lib/fontTools/varLib/instancer/__init__.py
index 0bdb494b9..6a79fc9c2 100644
--- a/Lib/fontTools/varLib/instancer/__init__.py
+++ b/Lib/fontTools/varLib/instancer/__init__.py
@@ -749,6 +749,12 @@ def instantiateCFF2(
setattr(private, name, newValues)
+ # Empty out the VarStore
+ for i, varData in enumerate(varStore.VarData):
+ assert varDataCursor[i] == varData.ItemCount, (varDataCursor[i], varData.ItemCount)
+ varData.Item = []
+ varData.ItemCount = 0
+
# Remove vsindex commands that are no longer needed, collect those that are.
usedVsindex = set()
for commands in allCommands:
@@ -777,12 +783,6 @@ def instantiateCFF2(
for cs, commands in zip(charStrings, allCommands):
cs.program = commandsToProgram(commands)
- # Empty out the VarStore
- for i, varData in enumerate(varStore.VarData):
- assert varDataCursor[i] == varData.ItemCount
- varData.Item = []
- varData.ItemCount = 0
-
# Remove empty VarStore
if not varStore.VarData:
del topDict.VarStore
diff --git a/Tests/varLib/instancer/data/CFF2Instancer-VF-2.ttx b/Tests/varLib/instancer/data/CFF2Instancer-VF-2.ttx
new file mode 100644
index 000000000..e26eba29d
--- /dev/null
+++ b/Tests/varLib/instancer/data/CFF2Instancer-VF-2.ttx
@@ -0,0 +1,615 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ License same as MutatorMath. BSD 3-clause. [test-token: C]
+
+
+ Regular
+
+
+ 1.002;LTTR;MutatorMathTest-LightCondensed
+
+
+ MutatorMathTest LightCondensed
+
+
+ Version 1.002
+
+
+ MutatorMathTest-LightCondensed
+
+
+ Width
+
+
+ Weight
+
+
+ width
+
+
+ weight
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1 blend
+ hlineto
+
+
+ 2 blend
+ rmoveto
+
+
+ 3 blend
+ hlineto
+
+
+ 1 blend
+ hmoveto
+
+
+ 0 100 0 2 blend
+ rlineto
+
+
+ 1 vsindex
+ 20 30 -30 0 -104 callsubr
+ 40 7 220 63 -107 callsubr
+ 140 700 375 -56 -169 -103 callsubr
+ -35 -7 -195 -43 -107 callsubr
+ -90 -536 -235 96 79 60 -144 -60 -106 callsubr
+ 250 36 -250 450 220 -190 -6 174 16 -450 -220 190 -105 callsubr
+ 257 -200 585 23 -275 -54 -130 44 -106 callsubr
+ 44 9 296 121 -107 callsubr
+ -145 700 -375 29 151 -103 callsubr
+ -39 -9 -281 -121 -107 callsubr
+ -17 -39 15 -73 5 3 -221 -3 -106 callsubr
+ 47 39 -47 3 223 147 -3 221 3 -3 -223 -147 -105 callsubr
+
+
+
+
+
+
+
+
+
+ -102 callsubr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+