1 files changed, 85 insertions, 0 deletions
diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index 824af64ae..40c7e20d5 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -1004,6 +1004,30 @@ namespace Slang
         return inst;
     }
 
+    IRInst* IRBuilder::emitMakeVector(
+        IRType*         type,
+        UInt            argCount,
+        IRValue* const* args)
+    {
+        return emitIntrinsicInst(type, kIROp_makeVector, argCount, args);
+    }
+
+    IRInst* IRBuilder::emitMakeArray(
+        IRType*         type,
+        UInt            argCount,
+        IRValue* const* args)
+    {
+        return emitIntrinsicInst(type, kIROp_makeArray, argCount, args);
+    }
+
+    IRInst* IRBuilder::emitMakeStruct(
+        IRType*         type,
+        UInt            argCount,
+        IRValue* const* args)
+    {
+        return emitIntrinsicInst(type, kIROp_makeStruct, argCount, args);
+    }
+
     IRModule* IRBuilder::createModule()
     {
         auto module = new IRModule();
@@ -1176,6 +1200,18 @@ namespace Slang
         return globalVar;
     }
 
+    IRGlobalConstant* IRBuilder::createGlobalConstant(
+        IRType* valueType)
+    {
+        IRGlobalConstant* globalConstant = createValue<IRGlobalConstant>(
+            this,
+            kIROp_global_constant,
+            valueType);
+        maybeSetSourceLoc(this, globalConstant);
+        addGlobalValue(getModule(), globalConstant);
+        return globalConstant;
+    }
+
     IRWitnessTable* IRBuilder::createWitnessTable()
     {
         IRWitnessTable* witnessTable = createValue<IRWitnessTable>(
@@ -1747,6 +1783,7 @@ namespace Slang
         {
         case kIROp_Func:
         case kIROp_global_var:
+        case kIROp_global_constant:
         case kIROp_witness_table:
             {
                 auto irFunc = (IRFunc*) inst;
@@ -2391,6 +2428,22 @@ namespace Slang
         dump(context, ";\n");
     }
 
+    void dumpIRGlobalConstant(
+        IRDumpContext*      context,
+        IRGlobalConstant*   val)
+    {
+        dump(context, "\n");
+        dumpIndent(context);
+        dump(context, "ir_global_constant ");
+        dumpID(context, val);
+        dumpInstTypeClause(context, val->getType());
+
+        // TODO: deal with the case where a global
+        // might have embedded initialization logic.
+
+        dump(context, ";\n");
+    }
+
     void dumpIRWitnessTableEntry(
         IRDumpContext*          context,
         IRWitnessTableEntry*    entry)
@@ -2436,6 +2489,10 @@ namespace Slang
             dumpIRGlobalVar(context, (IRGlobalVar*)value);
             break;
 
+        case kIROp_global_constant:
+            dumpIRGlobalConstant(context, (IRGlobalConstant*)value);
+            break;
+
         case kIROp_witness_table:
             dumpIRWitnessTable(context, (IRWitnessTable*)value);
             break;
@@ -3501,6 +3558,7 @@ namespace Slang
         switch (originalValue->op)
         {
         case kIROp_global_var:
+        case kIROp_global_constant:
         case kIROp_Func:
         case kIROp_witness_table:
             return cloneGlobalValue(this, (IRGlobalValue*) originalValue);
@@ -3776,6 +3834,29 @@ namespace Slang
         return clonedVar;
     }
 
+    IRGlobalConstant* cloneGlobalConstantImpl(
+        IRSpecContext*      context,
+        IRGlobalConstant*    originalVal,
+        IROriginalValuesForClone const& originalValues)
+    {
+        auto clonedVal = context->builder->createGlobalConstant(context->maybeCloneType(originalVal->getType()));
+        registerClonedValue(context, clonedVal, originalValues);
+
+        auto mangledName = originalVal->mangledName;
+        clonedVal->mangledName = mangledName;
+
+        cloneDecorations(context, clonedVal, originalVal);
+
+        // Clone any code in the body of the constant, since this
+        // represents the initializer.
+        cloneGlobalValueWithCodeCommon(
+            context,
+            clonedVal,
+            originalVal);
+
+        return clonedVal;
+    }
+
     IRWitnessTable* cloneWitnessTableImpl(
         IRSpecContextBase*  context,
         IRWitnessTable* originalTable,
@@ -4051,6 +4132,7 @@ namespace Slang
             return ((IRWitnessTable*)val)->entries.first != nullptr;
 
         case kIROp_global_var:
+        case kIROp_global_constant:
         case kIROp_Func:
             return ((IRGlobalValueWithCode*)val)->firstBlock != nullptr;
 
@@ -4149,6 +4231,9 @@ namespace Slang
         case kIROp_global_var:
             return cloneGlobalVarImpl(context, (IRGlobalVar*)originalVal, sym);
 
+        case kIROp_global_constant:
+            return cloneGlobalConstantImpl(context, (IRGlobalConstant*)originalVal, sym);
+
         case kIROp_witness_table:
             return cloneWitnessTableImpl(context, (IRWitnessTable*)originalVal, sym);