From 245466d89cfe54b78da486f06d470bc6daaf4625 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 16 Feb 2023 16:44:04 -0800 Subject: Remove `SharedIRBuilder`. (#2657) Co-authored-by: Yong He --- source/slang/slang-ir-clone.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'source/slang/slang-ir-clone.cpp') diff --git a/source/slang/slang-ir-clone.cpp b/source/slang/slang-ir-clone.cpp index 8b8b28f09..050d1e392 100644 --- a/source/slang/slang-ir-clone.cpp +++ b/source/slang/slang-ir-clone.cpp @@ -124,19 +124,18 @@ struct IRCloningOldNewPair // static void _cloneInstDecorationsAndChildren( IRCloneEnv* env, - SharedIRBuilder* sharedBuilder, + IRModule* module, IRInst* oldInst, IRInst* newInst) { SLANG_ASSERT(env); - SLANG_ASSERT(sharedBuilder); SLANG_ASSERT(oldInst); SLANG_ASSERT(newInst); // We will set up an IR builder that inserts // into the new parent instruction. // - IRBuilder builderStorage(sharedBuilder); + IRBuilder builderStorage(module); auto builder = &builderStorage; builder->setInsertInto(newInst); @@ -202,7 +201,7 @@ static void _cloneInstDecorationsAndChildren( auto oldChild = pair.oldInst; auto newChild = pair.newInst; - _cloneInstDecorationsAndChildren(env, sharedBuilder, oldChild, newChild); + _cloneInstDecorationsAndChildren(env, module, oldChild, newChild); } } @@ -214,11 +213,11 @@ static void _cloneInstDecorationsAndChildren( // void cloneInstDecorationsAndChildren( IRCloneEnv* env, - SharedIRBuilder* sharedBuilder, + IRModule* module, IRInst* oldInst, IRInst* newInst) { - SLANG_ASSERT(sharedBuilder); + SLANG_ASSERT(module); SLANG_ASSERT(oldInst); SLANG_ASSERT(newInst); @@ -233,7 +232,7 @@ void cloneInstDecorationsAndChildren( subEnv = &subEnvStorage; subEnv->parent = env; } - _cloneInstDecorationsAndChildren(subEnv, sharedBuilder, oldInst, newInst); + _cloneInstDecorationsAndChildren(subEnv, module, oldInst, newInst); } // The convenience function `cloneInst` just sequences the @@ -273,7 +272,7 @@ IRInst* cloneInst( env->mapOldValToNew.Add(oldInst, newInst); cloneInstDecorationsAndChildren( - env, builder->getSharedBuilder(), oldInst, newInst); + env, builder->getModule(), oldInst, newInst); return newInst; } @@ -284,8 +283,7 @@ void cloneDecoration( IRInst* newParent, IRModule* module) { - SharedIRBuilder sharedBuilder(module); - IRBuilder builder(sharedBuilder); + IRBuilder builder(module); if(auto first = newParent->getFirstDecorationOrChild()) builder.setInsertBefore(first); -- cgit v1.2.3