Fix off-by-one in symbol lookup location for detecting parameters use…

…d before declared
MikePopoloski · Apr 29, 2023 · a5240e3 · a5240e3
1 parent c50549a
commit a5240e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/source/ast/Symbol.cpp b/source/ast/Symbol.cpp
@@ -205,14 +205,14 @@ std::optional<bool> Symbol::isDeclaredBefore(LookupLocation target) const {
     // If target wasn't in a direct scope of any of our own parents,
     // repeat the process walking up target's scopes.
     sym = &target.getScope()->asSymbol();
-    ll = LookupLocation::before(*sym);
+    ll = LookupLocation::after(*sym);
 
     while ((scope = ll.getScope()) != nullptr && sym->kind != SymbolKind::CompilationUnit) {
         if (auto it = locMap.find(scope); it != locMap.end())
             return it->second < ll;
 
         sym = &scope->asSymbol();
-        ll = LookupLocation::before(*sym);
+        ll = LookupLocation::after(*sym);
     }
 
     return std::nullopt;

diff --git a/tests/unittests/HierarchyTests.cpp b/tests/unittests/HierarchyTests.cpp
@@ -2254,3 +2254,21 @@ endmodule
     CHECK(diags[0].code == diag::InfoTask);
     CHECK(diags[1].code == diag::InfoTask);
 }
+
+TEST_CASE("Hierarchical parameter lookup location regress") {
+    auto tree = SyntaxTree::fromText(R"(
+interface I;
+    parameter int P = 6;
+    function automatic int getP; return P; endfunction
+endinterface
+
+module m;
+    I i();
+    localparam int a = i.getP();
+endmodule
+)");
+
+    Compilation compilation;
+    compilation.addSyntaxTree(tree);
+    NO_COMPILATION_ERRORS;
+}