Fixup

Author: Scheremo

lib/Tools/circt-verilog-lsp-server/VerilogServerImpl/SlangProjectLookup.cpp

@@ -18,6 +18,7 @@
 #include "slang/ast/Lookup.h"
 #include "slang/ast/Scope.h"
 #include "slang/ast/Symbol.h"
+#include "slang/ast/Scope.h"
 #include "slang/ast/symbols/CompilationUnitSymbols.h"
 #include "slang/diagnostics/Diagnostics.h"
 #include "slang/syntax/AllSyntax.h"
@@ -39,7 +40,6 @@ struct DefIndex {
   std::unordered_map<std::string, slang::SourceLocation> byName;
 };
 
-
 static void indexDeclarators(const slang::syntax::SyntaxNode &node,
                              DefIndex &out) {
   using namespace slang::syntax;
@@ -60,12 +60,22 @@ static void indexDeclarators(const slang::syntax::SyntaxNode &node,
 
 /// Walk the syntax tree from its root down to collect all declarators;
 /// declarators contain symbol definitions we can lookup later.
-static void walk(const slang::syntax::SyntaxNode &node, DefIndex &out) {
-  indexDeclarators(node, out);
+static void walk(const slang::syntax::SyntaxNode &root, DefIndex &out) {
+  llvm::SmallVector<const slang::syntax::SyntaxNode *, 32> worklist;
+  worklist.push_back(&root);
+
+  while (!worklist.empty()) {
+    const slang::syntax::SyntaxNode *node = worklist.pop_back_val();
 
-  for (size_t i = 0, e = node.getChildCount(); i < e; ++i)
-    if (auto *c = node.childNode(i))
-      walk(*c, out);
+    // Collect declarators at this node.
+    indexDeclarators(*node, out);
+
+    // Push children to the stack.
+    for (size_t i = 0, e = node->getChildCount(); i < e; ++i) {
+      if (auto *c = node->childNode(i))
+        worklist.push_back(c);
+    }
+  }
 }
 
 static bool isLocationInRange(slang::SourceRange r, slang::SourceLocation loc) {
@@ -84,7 +94,7 @@ struct DefinitionVisitor : public slang::syntax::SyntaxVisitor<
 
   DefinitionVisitor(const slang::ast::Compilation &comp,
                     const slang::ast::Scope &rootScope,
-                    slang::SourceLocation queryLoc, DefIndex &defIndex)
+                    slang::SourceLocation queryLoc, const DefIndex &defIndex)
       : comp(comp), rootScope(rootScope), queryLoc(queryLoc),
         defIndex(defIndex) {}
 
@@ -129,7 +139,7 @@ struct DefinitionVisitor : public slang::syntax::SyntaxVisitor<
   const slang::ast::Compilation &comp;
   const slang::ast::Scope &rootScope;
   slang::SourceLocation queryLoc;
-  DefIndex &defIndex;
+  const DefIndex &defIndex;
 };
 
 } // namespace

lib/Tools/circt-verilog-lsp-server/VerilogServerImpl/VerilogServer.cpp

@@ -17,11 +17,14 @@
 
 #include "circt/Support/LLVM.h"
 #include "circt/Tools/circt-verilog-lsp-server/CirctVerilogLspServerMain.h"
+#include "slang/analysis/AnalysisManager.h"
 #include "slang/ast/Compilation.h"
 #include "slang/ast/Scope.h"
+#include "slang/ast/symbols/CompilationUnitSymbols.h"
 #include "slang/diagnostics/DiagnosticClient.h"
 #include "slang/diagnostics/Diagnostics.h"
 #include "slang/driver/Driver.h"
+#include "slang/syntax/AllSyntax.h"
 #include "slang/syntax/SyntaxTree.h"
 #include "slang/text/SourceLocation.h"
 #include "slang/text/SourceManager.h"
@@ -295,7 +298,7 @@ VerilogDocument::getDefinitionAt(const llvm::lsp::Position &pos) {
   const auto &sm = comp.getSourceManager();
 
   SlangProjectLookup sl =
-      SlangProjectLookup(comp, comp.getRootNoFinalize(), *sm);
+      SlangProjectLookup(comp, comp.getRoot(), *sm);
   slang::SourceLocation loc = sl.lspPositionToSlangLocation(mainBufferId, pos);
 
   // Identify a name-like syntax under the cursor.