1 files changed, 5 insertions, 13 deletions

diff --git a/source/slang/slang-ir-lower-optional-type.cpp b/source/slang/slang-ir-lower-optional-type.cpp
index c4a40774c..4156fe9e1 100644
--- a/source/slang/slang-ir-lower-optional-type.cpp
+++ b/source/slang/slang-ir-lower-optional-type.cpp
@@ -12,8 +12,6 @@ namespace Slang
         IRModule* module;
         DiagnosticSink* sink;
 
-        SharedIRBuilder sharedBuilderStorage;
-
         List<IRInst*> workList;
         HashSet<IRInst*> workListSet;
 
@@ -113,7 +111,7 @@ namespace Slang
 
         void processMakeOptionalValue(IRMakeOptionalValue* inst)
         {
-            IRBuilder builderStorage(sharedBuilderStorage);
+            IRBuilder builderStorage(module);
             auto builder = &builderStorage;
             builder->setInsertBefore(inst);
 
@@ -136,7 +134,7 @@ namespace Slang
 
         void processMakeOptionalNone(IRMakeOptionalNone* inst)
         {
-            IRBuilder builderStorage(sharedBuilderStorage);
+            IRBuilder builderStorage(module);
             auto builder = &builderStorage;
             builder->setInsertBefore(inst);
 
@@ -178,7 +176,7 @@ namespace Slang
 
         void processGetOptionalHasValue(IROptionalHasValue* inst)
         {
-            IRBuilder builderStorage(sharedBuilderStorage);
+            IRBuilder builderStorage(module);
             auto builder = &builderStorage;
             builder->setInsertBefore(inst);
 
@@ -190,7 +188,7 @@ namespace Slang
 
         void processGetOptionalValue(IRGetOptionalValue* inst)
         {
-            IRBuilder builderStorage(sharedBuilderStorage);
+            IRBuilder builderStorage(module);
             auto builder = &builderStorage;
             builder->setInsertBefore(inst);
 
@@ -215,7 +213,7 @@ namespace Slang
 
         void processOptionalType(IROptionalType* inst)
         {
-            IRBuilder builderStorage(sharedBuilderStorage);
+            IRBuilder builderStorage(module);
             auto builder = &builderStorage;
             builder->setInsertBefore(inst);
 
@@ -250,12 +248,6 @@ namespace Slang
 
         void processModule()
         {
-            SharedIRBuilder* sharedBuilder = &sharedBuilderStorage;
-            sharedBuilder->init(module);
-
-            // Deduplicate equivalent types.
-            sharedBuilder->deduplicateAndRebuildGlobalNumberingMap();
-
             addToWorkList(module->getModuleInst());
 
             while (workList.getCount() != 0)