From 92c9fffb95c92b0bc07eb1c656375928b5cd5c33 Mon Sep 17 00:00:00 2001
From: Darren Wihandi <65404740+fairywreath@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:12:38 -0500
Subject: improve error message on generic value decls (#6169)

Co-authored-by: Yong He <yonghe@outlook.com>
---
 source/slang/slang-syntax.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'source/slang/slang-syntax.cpp')

diff --git a/source/slang/slang-syntax.cpp b/source/slang/slang-syntax.cpp
index 6fdd5088a..e479f1b9d 100644
--- a/source/slang/slang-syntax.cpp
+++ b/source/slang/slang-syntax.cpp
@@ -284,7 +284,18 @@ SourceLoc getDiagnosticPos(DeclRefBase* declRef)
 {
     if (!declRef)
         return SourceLoc();
-    return declRef->getDecl()->loc;
+    return getDiagnosticPos(declRef->getDecl());
+}
+
+SourceLoc getDiagnosticPos(Decl* decl)
+{
+    if (!decl)
+        return SourceLoc();
+    if (decl->getNameLoc().isValid())
+    {
+        return decl->getNameLoc();
+    }
+    return decl->loc;
 }
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!  Free functions !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- 
cgit v1.2.3