From 643aaa13d2c6e0c4994437aa9fba6716787608ce Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 7 Jul 2023 14:26:37 -0700
Subject: Make DeclRefBase a Val, and DeclRef<T> a helper class. (#2967)

* Make DeclRefBase a Val, and DeclRef<T> a helper class.

* Fixes.

* Workaround gcc parser issue.

* Revert NodeOperand change.

* Fix.

* Fix clang incomplete class complains.

* Fix code review.

* Small cleanups and improvements.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-language-server.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source/slang/slang-language-server.cpp')

diff --git a/source/slang/slang-language-server.cpp b/source/slang/slang-language-server.cpp
index db50f9bdb..e79716975 100644
--- a/source/slang/slang-language-server.cpp
+++ b/source/slang/slang-language-server.cpp
@@ -707,11 +707,11 @@ SlangResult LanguageServer::hover(
     }
     else if (auto decl = as<Decl>(leafNode))
     {
-        fillDeclRefHoverInfo(version->linkage->getASTBuilder()->getSpecializedDeclRef(decl, nullptr));
+        fillDeclRefHoverInfo(makeDeclRef(decl));
     }
     else if (auto attr = as<Attribute>(leafNode))
     {
-        fillDeclRefHoverInfo(version->linkage->getASTBuilder()->getSpecializedDeclRef(attr->attributeDecl, nullptr));
+        fillDeclRefHoverInfo(makeDeclRef(attr->attributeDecl));
     }
     if (sb.getLength() == 0)
     {
@@ -1320,7 +1320,7 @@ SlangResult LanguageServer::signatureHelp(
             // Look for initializers
             for (auto member : aggDecl->getMembersOfType<ConstructorDecl>())
             {
-                addDeclRef(version->linkage->getASTBuilder()->getSpecializedDeclRef<Decl>(member, declRefExpr->declRef.substitutions));
+                addDeclRef(version->linkage->getASTBuilder()->getSpecializedDeclRef<Decl>(member, declRefExpr->declRef.getSubst()));
             }
         }
         else
-- 
cgit v1.2.3