Merge pull request #379 from tfoleyNV/generic-extension-fixes

Generic extension fixes

1 files changed, 13 insertions, 0 deletions

diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index 1d3c91979..b965f908c 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -4510,6 +4510,19 @@ namespace Slang
             }
         }
 
+        if( !newGenericDecl )
+        {
+            if(auto gd = dynamic_cast<GenericDecl*>(newDecl))
+            {
+                if( auto ed = gd->inner.As<ExtensionDecl>() )
+                {
+                    // TODO: we should confirm that it is an extension for the correct type...
+
+                    newGenericDecl = gd;
+                }
+            }
+        }
+
         SLANG_ASSERT(newGenericDecl);
 
         RefPtr<GenericSubstitution> newSubst = new GenericSubstitution();