Merge branch 'master' into fix-nested-type-conformances

1 files changed, 6 insertions, 1 deletions

diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp
index 6b58809a6..0af318c9e 100644
--- a/source/slang/syntax.cpp
+++ b/source/slang/syntax.cpp
@@ -1427,7 +1427,7 @@ void Type::accept(IValVisitor* visitor, void* extra)
 
     RefPtr<Substitutions> GlobalGenericParamSubstitution::applySubstitutionsShallow(SubstitutionSet substSet, RefPtr<Substitutions> substOuter, int* ioDiff)
     {
-        // if we find a GlobalGenericParamSubstitution in subst that references the same __generic_param decl
+        // if we find a GlobalGenericParamSubstitution in subst that references the same type_param decl
         // return a copy of that GlobalGenericParamSubstitution
         int diff = 0;
 
@@ -1884,6 +1884,11 @@ void Type::accept(IValVisitor* visitor, void* extra)
         return decl->nameAndLoc.name;
     }
 
+    SourceLoc DeclRefBase::getLoc() const
+    {
+        return decl->loc;
+    }
+
     DeclRefBase DeclRefBase::GetParent() const
     {
         // Want access to the free function (the 'as' method by default gets priority)