Merge branch 'master' into glsl-loop

1 files changed, 2 insertions, 0 deletions

diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
index 3aeca23cd..ab22108b9 100644
--- a/source/slang/slang-check-decl.cpp
+++ b/source/slang/slang-check-decl.cpp
@@ -1581,6 +1581,7 @@ namespace Slang
         if(!witnessTable)
         {
             witnessTable = new WitnessTable();
+            witnessTable->baseType = DeclRefType::create(m_astBuilder, interfaceDeclRef);
         }
         context->mapInterfaceToWitnessTable.Add(interfaceDeclRef, witnessTable);
 
@@ -2137,6 +2138,7 @@ namespace Slang
             // let them define a tag value with the name `__Tag`).
             //
             RefPtr<WitnessTable> witnessTable = new WitnessTable();
+            witnessTable->baseType = enumConformanceDecl->base.type;
             enumConformanceDecl->witnessTable = witnessTable;
 
             Name* tagAssociatedTypeName = getSession()->getNameObj("__Tag");