1 files changed, 31 insertions, 3 deletions

diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp
index 2c64c539b..4fabd6a81 100644
--- a/source/slang/lower-to-ir.cpp
+++ b/source/slang/lower-to-ir.cpp
@@ -314,6 +314,13 @@ LoweredValInfo emitDeclRef(
     IRGenContext*   context,
     DeclRef<Decl>   declRef);
 
+// Emit necessary `specialize` instruction needed by a declRef.
+// This is currently used by emitDeclRef() and emitFuncRef()
+LoweredValInfo maybeEmitSpecializeInst(IRGenContext*   context, 
+    LoweredValInfo loweredDecl,  // the lowered value of the inner decl
+    DeclRef<Decl>   declRef      // the full decl ref containing substitutions
+);
+
 
 IRValue* getSimpleVal(IRGenContext* context, LoweredValInfo lowered);
 
@@ -488,10 +495,11 @@ LoweredValInfo emitFuncRef(
 
                 RefPtr<Type> type = funcExpr->type;
 
-                return LoweredValInfo::simple(context->irBuilder->emitLookupInterfaceMethodInst(
+                auto loweredVal = LoweredValInfo::simple(context->irBuilder->emitLookupInterfaceMethodInst(
                     type,
                     baseMemberDeclRef,
                     funcDeclRef));
+                return maybeEmitSpecializeInst(context, loweredVal, funcDeclRef);
             }
         }
     }
@@ -2893,6 +2901,13 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
         return LoweredValInfo::simple(irFunc);
     }
 
+    LoweredValInfo visitGenericDecl(GenericDecl * genDecl)
+    {
+        if (auto innerFuncDecl = genDecl->inner->As<FuncDecl>())
+            return lowerFuncDecl(innerFuncDecl);
+        SLANG_RELEASE_ASSERT(false);
+        UNREACHABLE_RETURN(LoweredValInfo());
+    }
 
     LoweredValInfo visitFunctionDeclBase(FunctionDeclBase* decl)
     {
@@ -2997,6 +3012,11 @@ RefPtr<Val> lowerSubstitutionArg(
     }
     else if (auto declaredSubtypeWitness = dynamic_cast<DeclaredSubtypeWitness*>(val))
     {
+        // We do not have a concrete witness table yet for a GenericTypeConstraintDecl witness
+
+        if (declaredSubtypeWitness->declRef.As<GenericTypeConstraintDecl>())
+            return val;
+
         // We need to look up the IR-level representation of the witness
         // (which is a witness table).
 
@@ -3073,9 +3093,16 @@ LoweredValInfo emitDeclRef(
     // unspecialized declaration.
     LoweredValInfo loweredDecl = ensureDecl(context, declRef.getDecl());
 
+    return maybeEmitSpecializeInst(context, loweredDecl, declRef);
+}
+
+LoweredValInfo maybeEmitSpecializeInst(IRGenContext*   context,
+    LoweredValInfo loweredDecl,
+    DeclRef<Decl>   declRef)
+{
     // If this declaration reference doesn't involve any specializations,
     // then we are done at this point.
-    if(!hasGenericSubstitutions(declRef.substitutions))
+    if (!hasGenericSubstitutions(declRef.substitutions))
         return loweredDecl;
 
     auto val = getSimpleVal(context, loweredDecl);
@@ -3089,7 +3116,7 @@ LoweredValInfo emitDeclRef(
 
 
     RefPtr<Type> type;
-    if(auto declType = val->getType())
+    if (auto declType = val->getType())
     {
         type = declType->Substitute(declRef.substitutions).As<Type>();
     }
@@ -3102,6 +3129,7 @@ LoweredValInfo emitDeclRef(
         declRef));
 }
 
+
 static void lowerEntryPointToIR(
     IRGenContext*       context,
     EntryPointRequest*  entryPointRequest)