2 files changed, 21 insertions, 13 deletions
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index 6c004c84c..3438fd3f4 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -237,18 +237,15 @@ List<IRWitnessTableEntry*> CLikeSourceEmitter::getSortedWitnessTableEntries(IRWi
     for (UInt i = 0; i < interfaceType->getOperandCount(); i++)
     {
         auto reqKey = cast<IRStructKey>(interfaceType->getOperand(i));
-        bool matchingEntryFound = false;
         IRWitnessTableEntry* entry = nullptr;
         if (witnessTableEntryDictionary.TryGetValue(reqKey, entry))
         {
-            if (entry->requirementKey.get() == reqKey)
-            {
-                matchingEntryFound = true;
-                sortedWitnessTableEntries.add(entry);
-                break;
-            }
+            sortedWitnessTableEntries.add(entry);
+        }
+        else
+        {
+            SLANG_UNREACHABLE("interface requirement key not found in witness table.");
         }
-        SLANG_ASSERT(matchingEntryFound);
     }
     return sortedWitnessTableEntries;
 }
diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
index accb290fa..4a59f4cf9 100644
--- a/source/slang/slang-emit-cpp.cpp
+++ b/source/slang/slang-emit-cpp.cpp
@@ -1711,6 +1711,15 @@ void CPPSourceEmitter::_emitWitnessTableDefinitions()
                 m_writer->emit("&KernelContext::");
                 m_writer->emit(_getWitnessTableWrapperFuncName(funcVal));
             }
+            else if (auto witnessTableVal = as<IRWitnessTable>(entry->getSatisfyingVal()))
+            {
+                if (!isFirstEntry)
+                    m_writer->emit(",\n");
+                else
+                    isFirstEntry = false;
+                m_writer->emit("&");
+                m_writer->emit(getName(witnessTableVal));
+            }
             else
             {
                 // TODO: handle other witness table entry types.
@@ -1745,16 +1754,11 @@ void CPPSourceEmitter::_maybeEmitWitnessTableTypeDefinition(
     emitSimpleType(interfaceType);
     m_writer->emit("\n{\n");
     m_writer->indent();
-    bool isFirstEntry = true;
     for (Index i = 0; i < sortedWitnessTableEntries.getCount(); i++)
     {
         auto entry = sortedWitnessTableEntries[i];
         if (auto funcVal = as<IRFunc>(entry->satisfyingVal.get()))
         {
-            if (!isFirstEntry)
-                m_writer->emit(",\n");
-            else
-                isFirstEntry = false;
             emitType(funcVal->getResultType());
             m_writer->emit(" (KernelContext::*");
             m_writer->emit(getName(entry->requirementKey.get()));
@@ -1777,6 +1781,13 @@ void CPPSourceEmitter::_maybeEmitWitnessTableTypeDefinition(
             }
             m_writer->emit(");\n");
         }
+        else if (auto witnessTableVal = as<IRWitnessTable>(entry->getSatisfyingVal()))
+        {
+            emitType(as<IRType>(witnessTableVal->getOperand(0)));
+            m_writer->emit("* ");
+            m_writer->emit(getName(entry->requirementKey.get()));
+            m_writer->emit(";\n");
+        }
         else
         {
             // TODO: handle other witness table entry types.