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

Generic extension fixes

3 files changed, 20 insertions, 1 deletions

diff --git a/source/slang/check.cpp b/source/slang/check.cpp
index 52558ee15..e2d519a4c 100644
--- a/source/slang/check.cpp
+++ b/source/slang/check.cpp
@@ -1708,7 +1708,7 @@ namespace Slang
         {
             // TODO: actually implement matching here. For now we'll
             // just pretend that things are satisfied in order to make progress..
-            requirementDict.AddIfNotExists(requiredMemberDeclRef, DeclRef<Decl>(memberDecl, nullptr));
+            requirementDict.AddIfNotExists(requiredMemberDeclRef, memberDecl);
             return true;
         }
 
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();
diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp
index 5d710725a..42d6dc303 100644
--- a/source/slang/lower-to-ir.cpp
+++ b/source/slang/lower-to-ir.cpp
@@ -3734,6 +3734,8 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
 
     LoweredValInfo visitGenericDecl(GenericDecl * genDecl)
     {
+        // TODO: Should this just always visit/lower the inner decl?
+
         if (auto innerFuncDecl = genDecl->inner->As<FuncDecl>())
             return lowerFuncDecl(innerFuncDecl);
         else if (auto innerStructDecl = genDecl->inner->As<StructDecl>())
@@ -3741,6 +3743,10 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
             visitAggTypeDecl(innerStructDecl);
             return LoweredValInfo();
         }
+        else if( auto extensionDecl = genDecl->inner->As<ExtensionDecl>() )
+        {
+            return visitExtensionDecl(extensionDecl);
+        }
         SLANG_RELEASE_ASSERT(false);
         UNREACHABLE_RETURN(LoweredValInfo());
     }