1 files changed, 9 insertions, 4 deletions
diff --git a/source/slang/slang-ir-cleanup-void.cpp b/source/slang/slang-ir-cleanup-void.cpp
index 7fc9041ec..95716945b 100644
--- a/source/slang/slang-ir-cleanup-void.cpp
+++ b/source/slang/slang-ir-cleanup-void.cpp
@@ -10,8 +10,14 @@ namespace Slang
     {
         IRModule* module;
 
-        List<IRInst*> workList;
-        HashSet<IRInst*> workListSet;
+        InstWorkList workList;
+        InstHashSet workListSet;
+
+        CleanUpVoidContext(IRModule* inModule)
+            : module(inModule)
+            , workList(inModule)
+            , workListSet(inModule)
+        {}
 
         void addToWorkList(
             IRInst* inst)
@@ -174,8 +180,7 @@ namespace Slang
     
     void cleanUpVoidType(IRModule* module)
     {
-        CleanUpVoidContext context;
-        context.module = module;
+        CleanUpVoidContext context(module);
         context.processModule();
     }
 }