Add type parameter to getPtrValue()

Author: juliusikkala

source/slang/slang-ir-clone.cpp

@@ -51,14 +51,18 @@ IRInst* cloneInstAndOperands(IRCloneEnv* env, IRBuilder* builder, IRInst* oldIns
     SLANG_ASSERT(builder);
     SLANG_ASSERT(oldInst);
 
+    // We start by mapping the type of the orignal instruction
+    // to its replacement value, if any.
+    //
+    auto oldType = oldInst->getFullType();
+    auto newType = (IRType*)findCloneForOperand(env, oldType);
+
     // Pointer literals need to be handled separately, as they carry other data
     // than just the operands.
     if (oldInst->getOp() == kIROp_PtrLit)
     {
         auto oldPtr = as<IRPtrLit>(oldInst);
-        auto newInst = builder->emitPtrLit(oldPtr->getFullType(), oldPtr->value.ptrVal);
-        newInst->sourceLoc = oldPtr->sourceLoc;
-        return newInst;
+        return builder->getPtrValue(newType, oldPtr->value.ptrVal);
     }
 
     // This logic will not handle any instructions
@@ -72,12 +76,6 @@ IRInst* cloneInstAndOperands(IRCloneEnv* env, IRBuilder* builder, IRInst* oldIns
     //
     SLANG_ASSERT(!as<IRConstant>(oldInst));
 
-    // We start by mapping the type of the orignal instruction
-    // to its replacement value, if any.
-    //
-    auto oldType = oldInst->getFullType();
-    auto newType = (IRType*)findCloneForOperand(env, oldType);
-
     // Next we will iterate over the operands of `oldInst`
     // to find their replacements and install them as
     // the operands of `newInst`.

source/slang/slang-ir-insts.h

@@ -3596,7 +3596,7 @@ struct IRBuilder
     IRInst* getFloatValue(IRType* type, IRFloatingPointValue value);
     IRStringLit* getStringValue(const UnownedStringSlice& slice);
     IRBlobLit* getBlobValue(ISlangBlob* blob);
-    IRPtrLit* _getPtrValue(void* ptr);
+    IRPtrLit* getPtrValue(IRType* type, void* ptr);
     IRPtrLit* getNullPtrValue(IRType* type);
     IRPtrLit* getNullVoidPtrValue() { return getNullPtrValue(getPtrType(getVoidType())); }
     IRVoidLit* getVoidValue();
@@ -4433,8 +4433,6 @@ struct IRBuilder
 
     IRGlobalConstant* emitGlobalConstant(IRType* type, IRInst* val);
 
-    IRConstant* emitPtrLit(IRType* type, void* ptr);
-
     IRInst* emitWaveMaskBallot(IRType* type, IRInst* mask, IRInst* condition);
     IRInst* emitWaveMaskMatch(IRType* type, IRInst* mask, IRInst* value);
 

source/slang/slang-ir.cpp

@@ -2395,9 +2395,8 @@ IRBlobLit* IRBuilder::getBlobValue(ISlangBlob* blob)
     return static_cast<IRBlobLit*>(_findOrEmitConstant(keyInst));
 }
 
-IRPtrLit* IRBuilder::_getPtrValue(void* data)
+IRPtrLit* IRBuilder::getPtrValue(IRType* type, void* data)
 {
-    auto type = getPtrType(getVoidType());
     IRConstant keyInst;
     memset(&keyInst, 0, sizeof(keyInst));
     keyInst.m_op = kIROp_PtrLit;
@@ -5844,16 +5843,6 @@ IRGlobalConstant* IRBuilder::emitGlobalConstant(IRType* type, IRInst* val)
     return inst;
 }
 
-IRConstant* IRBuilder::emitPtrLit(IRType* type, void* ptrVal)
-{
-    const size_t prefixSize = SLANG_OFFSET_OF(IRConstant, value);
-    const size_t instSize = prefixSize + sizeof(void*);
-    auto inst = static_cast<IRConstant*>(_createInst(instSize, type, kIROp_PtrLit));
-    inst->value.ptrVal = ptrVal;
-    addInst(inst);
-    return inst;
-}
-
 IRInst* IRBuilder::emitWaveMaskBallot(IRType* type, IRInst* mask, IRInst* condition)
 {
     auto inst = createInst<IRInst>(this, kIROp_WaveMaskBallot, type, mask, condition);
@@ -6334,7 +6323,7 @@ IRDecoration* IRBuilder::addDecoration(
 
 void IRBuilder::addHighLevelDeclDecoration(IRInst* inst, Decl* decl)
 {
-    auto ptrConst = _getPtrValue(decl);
+    auto ptrConst = getPtrValue(getPtrType(getVoidType()), decl);
     addDecoration(inst, kIROp_HighLevelDeclDecoration, ptrConst);
 }