1 files changed, 7 insertions, 4 deletions
diff --git a/source/slang/slang-ir-lower-optional-type.cpp b/source/slang/slang-ir-lower-optional-type.cpp
index 9d6b98dc9..91b108ffe 100644
--- a/source/slang/slang-ir-lower-optional-type.cpp
+++ b/source/slang/slang-ir-lower-optional-type.cpp
@@ -12,8 +12,12 @@ namespace Slang
         IRModule* module;
         DiagnosticSink* sink;
 
-        List<IRInst*> workList;
-        HashSet<IRInst*> workListSet;
+        InstWorkList workList;
+        InstHashSet workListSet;
+
+        OptionalTypeLoweringContext(IRModule* inModule)
+            :module(inModule), workList(inModule), workListSet(inModule)
+        {}
 
         struct LoweredOptionalTypeInfo : public RefObject
         {
@@ -275,8 +279,7 @@ namespace Slang
     
     void lowerOptionalType(IRModule* module, DiagnosticSink* sink)
     {
-        OptionalTypeLoweringContext context;
-        context.module = module;
+        OptionalTypeLoweringContext context(module);
         context.sink = sink;
         context.processModule();
     }