From 245466d89cfe54b78da486f06d470bc6daaf4625 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Thu, 16 Feb 2023 16:44:04 -0800
Subject: Remove `SharedIRBuilder`. (#2657)

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-ir-link.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'source/slang/slang-ir-link.cpp')

diff --git a/source/slang/slang-ir-link.cpp b/source/slang/slang-ir-link.cpp
index 55048484f..bcff5621c 100644
--- a/source/slang/slang-ir-link.cpp
+++ b/source/slang/slang-ir-link.cpp
@@ -54,7 +54,6 @@ struct IRSharedSpecContext
     typedef Dictionary<String, RefPtr<IRSpecSymbol>> SymbolDictionary;
     SymbolDictionary symbols;
 
-    SharedIRBuilder sharedBuilderStorage;
     IRBuilder builderStorage;
 
     // The "global" specialization environment.
@@ -1369,19 +1368,13 @@ void initializeSharedSpecContext(
     CodeGenTarget           target,
     TargetRequest*          targetReq)
 {
-
-    SharedIRBuilder* sharedBuilder = &sharedContext->sharedBuilderStorage;
-
-    IRBuilder* builder = &sharedContext->builderStorage;
-
     RefPtr<IRModule> module = inModule;
     if( !module )
     {
         module = IRModule::create(session);
     }
 
-    sharedBuilder->init(module);
-    builder->init(sharedBuilder);
+    sharedContext->builderStorage = IRBuilder(module);
 
     sharedContext->module = module;
     sharedContext->target = target;
@@ -1506,12 +1499,11 @@ LinkedIR linkIR(
     // Combine all of the contents of IRGlobalHashedStringLiterals
     {
         StringSlicePool pool(StringSlicePool::Style::Empty);
-        IRBuilder& builder = sharedContext->builderStorage;
         for (IRModule* irModule : irModules)
         {
             findGlobalHashedStringLiterals(irModule, pool);
         }
-        addGlobalHashedStringLiterals(pool, *builder.getSharedBuilder());
+        addGlobalHashedStringLiterals(pool, state->irModule);
     }
 
     // Set up shared and builder insert point
-- 
cgit v1.2.3