unified: Replace getDefiningNode() with isDeclarationSite()

Author: asgerf

unified/ql/lib/codeql/unified/internal/LocalNameBinding.qll

@@ -316,9 +316,6 @@ module Public {
     /** Gets the location of this local name's first declaration */
     Location getLocation() { result = super.getLocation() }
 
-    /** Gets the AST node defining this local name. */
-    AstNode getDefiningNode() { result = super.getDefiningNode() }
-
     /** Gets the name of this local, as a string. */
     string getName() { result = super.getName() }
   }

unified/ql/test/library-tests/local-name-binding/test.ql

@@ -37,10 +37,15 @@ module VariableAccessTest implements TestSig {
     )
   }
 
+  private PotentialLocalNameAccess getUniqueDeclarationSite(LocalName name) {
+    result =
+      unique(PotentialLocalNameAccess ac | ac.isDeclarationSite() and ac.getLocalName() = name)
+  }
+
   predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(PotentialLocalNameAccess va, LocalName v |
       v = va.getLocalName() and
-      not va = v.getDefiningNode() and
+      not va = getUniqueDeclarationSite(v) and // no need to annotate declaration site, if there is only one
       location = va.getLocation() and
       element = va.toString() and
       decl(v, value) and