Go: Use new location in hasLocationInfo

2025-12-16 16:53:25 +01:00 · 2022-06-02 15:05:58 +02:00
parent 3f857e113c
commit aadf7aefb0
37 changed files with 51 additions and 51 deletions
--- a/go/ql/test/TestUtilities/InlineFlowTest.qll
+++ b/go/ql/test/TestUtilities/InlineFlowTest.qll
@@ -79,7 +79,7 @@ class InlineFlowTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "hasValueFlow" and
    exists(DataFlow::Node src, DataFlow::Node sink | getValueFlowConfig().hasFlow(src, sink) |
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString() and
      value = "\"" + sink.toString() + "\""
    )
@@ -88,7 +88,7 @@ class InlineFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node src, DataFlow::Node sink |
      getTaintFlowConfig().hasFlow(src, sink) and not getValueFlowConfig().hasFlow(src, sink)
    |
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString() and
      value = "\"" + sink.toString() + "\""
    )
--- a/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql
+++ b/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql
@@ -12,7 +12,7 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    // Dynamic key-value header:
    exists(HTTP::HeaderWrite hw |
-      hw.hasLocationInfo(file, line, _, _, _) and
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = hw.getName().toString() and
        value = hw.getName().toString() and
@@ -26,7 +26,7 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
    or
    // Static key, dynamic value header:
    exists(HTTP::HeaderWrite hw |
-      hw.hasLocationInfo(file, line, _, _, _) and
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = hw.getHeaderName().toString() and
        value = hw.getHeaderName() and
@@ -40,7 +40,7 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
    or
    // Static key, static value header:
    exists(HTTP::HeaderWrite hw |
-      hw.hasLocationInfo(file, line, _, _, _) and
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = hw.getHeaderName().toString() and
        value = hw.getHeaderName() and
--- a/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql
+++ b/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql
@@ -10,7 +10,7 @@ class HttpRedirectTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "redirectUrl" and
    exists(HTTP::Redirect rd |
-      rd.hasLocationInfo(file, line, _, _, _) and
+      rd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = rd.getUrl().toString() and
      value = rd.getUrl().toString()
    )
--- a/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql
+++ b/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql
@@ -9,7 +9,7 @@ class HttpResponseBodyTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(HTTP::ResponseBody rd |
-      rd.hasLocationInfo(file, line, _, _, _) and
+      rd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = rd.getAContentType().toString() and
        value = rd.getAContentType().toString() and
--- a/go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql
+++ b/go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql
@@ -24,7 +24,7 @@ class TaintTrackingTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(Configuration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/experimental/frameworks/CleverGo/UntrustedSources.ql
+++ b/go/ql/test/experimental/frameworks/CleverGo/UntrustedSources.ql
@@ -16,7 +16,7 @@ class UntrustedFlowSourceTest extends InlineExpectationsTest {
    |
      element = arg.toString() and
      value = "" and
-      arg.hasLocationInfo(file, line, _, _, _)
+      arg.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql
+++ b/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql
@@ -12,7 +12,7 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    // Dynamic key-value header:
    exists(HTTP::HeaderWrite hw |
-      hw.hasLocationInfo(file, line, _, _, _) and
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = hw.getName().toString() and
        value = hw.getName().toString() and
@@ -26,7 +26,7 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
    or
    // Static key, dynamic value header:
    exists(HTTP::HeaderWrite hw |
-      hw.hasLocationInfo(file, line, _, _, _) and
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = hw.getHeaderName().toString() and
        value = hw.getHeaderName() and
@@ -40,7 +40,7 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
    or
    // Static key, static value header:
    exists(HTTP::HeaderWrite hw |
-      hw.hasLocationInfo(file, line, _, _, _) and
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = hw.getHeaderName().toString() and
        value = hw.getHeaderName() and
--- a/go/ql/test/experimental/frameworks/Fiber/Redirect.ql
+++ b/go/ql/test/experimental/frameworks/Fiber/Redirect.ql
@@ -10,7 +10,7 @@ class HttpRedirectTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "redirectUrl" and
    exists(HTTP::Redirect rd |
-      rd.hasLocationInfo(file, line, _, _, _) and
+      rd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = rd.getUrl().toString() and
      value = rd.getUrl().toString()
    )
--- a/go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql
+++ b/go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql
@@ -9,7 +9,7 @@ class HttpResponseBodyTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(HTTP::ResponseBody rd |
-      rd.hasLocationInfo(file, line, _, _, _) and
+      rd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      (
        element = rd.getAContentType().toString() and
        value = rd.getAContentType().toString() and
--- a/go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql
+++ b/go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql
@@ -24,7 +24,7 @@ class TaintTrackingTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(Configuration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/experimental/frameworks/Fiber/UntrustedFlowSources.ql
+++ b/go/ql/test/experimental/frameworks/Fiber/UntrustedFlowSources.ql
@@ -16,7 +16,7 @@ class UntrustedFlowSourceTest extends InlineExpectationsTest {
    |
      element = arg.toString() and
      value = "" and
-      arg.hasLocationInfo(file, line, _, _, _)
+      arg.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/Function/isVariadic.ql
+++ b/go/ql/test/library-tests/semmle/go/Function/isVariadic.ql
@@ -9,7 +9,7 @@ class FunctionIsVariadicTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(CallExpr ce |
      ce.getTarget().isVariadic() and
-      ce.hasLocationInfo(file, line, _, _, _) and
+      ce.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = ce.toString() and
      value = "" and
      tag = "isVariadic"
--- a/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.ql
@@ -13,7 +13,7 @@ class ImplementsComparableTest extends InlineExpectationsTest {
      ts.getName().matches("testComparable%") and
      ts.getATypeParameterDecl().getTypeConstraint().implementsComparable()
    |
-      ts.hasLocationInfo(file, line, _, _, _) and
+      ts.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = ts.getName() and
      value = ""
    )
--- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.ql
@@ -9,7 +9,7 @@ class SignatureTypeIsVariadicTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(FuncDef fd |
      fd.isVariadic() and
-      fd.hasLocationInfo(file, line, _, _, _) and
+      fd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = fd.toString() and
      value = "" and
      tag = "isVariadic"
--- a/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql
+++ b/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql
@@ -11,7 +11,7 @@ class HttpHandler extends InlineExpectationsTest {
    exists(HTTP::RequestHandler h, DataFlow::Node check |
      element = h.toString() and value = check.toString()
    |
-      h.hasLocationInfo(file, line, _, _, _) and
+      h.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      h.guardedBy(check)
    )
  }
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql
@@ -8,7 +8,7 @@ class LoggerTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(LoggerCall log |
-      log.hasLocationInfo(file, line, _, _, _) and
+      log.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = log.toString() and
      value = log.getAMessageComponent().toString() and
      tag = "logger"
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql
@@ -39,7 +39,7 @@ class DataFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(DataConfiguration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
@@ -66,7 +66,7 @@ class TaintFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(TaintConfiguration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.ql
@@ -33,7 +33,7 @@ class DataFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(TestConfig c).hasFlow(_, sink) |
      element = sink.toString() and
      value = sink.toString() and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql
@@ -23,7 +23,7 @@ class DataFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(TestConfig c).hasFlow(_, sink) |
      element = sink.toString() and
      value = sink.toString() and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/DataFlowConfig.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/DataFlowConfig.ql
@@ -29,7 +29,7 @@ class PromotedFieldsTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(TestConfig config, DataFlow::PathNode source, DataFlow::PathNode sink |
      config.hasFlowPath(source, sink) and
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString() and
      value = "" and
      tag = "promotedfields"
--- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql
@@ -30,7 +30,7 @@ class PromotedMethodsTest extends InlineExpectationsTest {
    exists(TestConfig config, DataFlow::Node source, DataFlow::Node sink |
      config.hasFlow(source, sink)
    |
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString() and
      value = source.getEnclosingCallable().getName() and
      tag = "promotedmethods"
--- a/go/ql/test/library-tests/semmle/go/dataflow/TypeAssertions/DataFlow.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/TypeAssertions/DataFlow.ql
@@ -23,7 +23,7 @@ class DataFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(Configuration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = sink.toString() and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql
@@ -23,7 +23,7 @@ class DataFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(DataConfiguration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
@@ -50,7 +50,7 @@ class TaintFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(TaintConfiguration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql
@@ -55,7 +55,7 @@ class DataFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(DataConfiguration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
@@ -84,7 +84,7 @@ class TaintFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(TaintConfiguration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.ql
@@ -12,7 +12,7 @@ class SqlInjectionTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(SqlInjection::Configuration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = sink.toString() and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql
@@ -10,7 +10,7 @@ class UntrustedFlowSourceTest extends InlineExpectationsTest {
    tag = "untrustedflowsource" and
    value = element and
    exists(UntrustedFlowSource src | value = "\"" + src.toString() + "\"" |
-      src.hasLocationInfo(file, line, _, _, _)
+      src.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
@@ -25,7 +25,7 @@ class HeaderWriteTest extends InlineExpectationsTest {
    exists(HTTP::HeaderWrite hw, string name, string val | element = hw.toString() |
      hw.definesHeader(name, val) and
      value = name + ":" + val and
-      hw.hasLocationInfo(file, line, _, _, _)
+      hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
@@ -37,7 +37,7 @@ class LoggerTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(LoggerCall log |
-      log.hasLocationInfo(file, line, _, _, _) and
+      log.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = log.toString() and
      value = log.getAMessageComponent().toString() and
      tag = "logger"
--- a/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql
@@ -26,7 +26,7 @@ class TaintFlowTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(Configuration c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }
--- a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/untrustedflowsource.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/untrustedflowsource.ql
@@ -9,7 +9,7 @@ class UntrustedFlowSourceTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(UntrustedFlowSource source |
-      source.hasLocationInfo(file, line, _, _, _) and
+      source.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = source.toString() and
      value = "\"" + source.toString() + "\"" and
      tag = "source"
--- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql
@@ -29,7 +29,7 @@ class K8sIoApiCoreV1Test extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(TestConfig config, DataFlow::PathNode source, DataFlow::PathNode sink |
      config.hasFlowPath(source, sink) and
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString() and
      value = "" and
      tag = "KsIoApiCoreV"
--- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql
@@ -29,7 +29,7 @@ class K8sIoApimachineryPkgRuntimeTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(TestConfig config, DataFlow::PathNode source, DataFlow::PathNode sink |
      config.hasFlowPath(source, sink) and
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString() and
      value = "" and
      tag = "KsIoApimachineryPkgRuntime"
--- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql
@@ -8,7 +8,7 @@ class K8sIoApimachineryPkgRuntimeTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(K8sIoClientGo::SecretInterfaceSource source |
-      source.hasLocationInfo(file, line, _, _, _) and
+      source.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = source.toString() and
      value = "" and
      tag = "KsIoClientGo"
--- a/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql
@@ -8,7 +8,7 @@ class NoSQLQueryTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(NoSQL::Query q |
-      q.hasLocationInfo(file, line, _, _, _) and
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = q.toString() and
      value = q.toString() and
      tag = "nosqlquery"
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql
@@ -25,7 +25,7 @@ class MissingDataFlowTest extends InlineExpectationsTest {
    value = "" and
    exists(Sink sink |
      not any(TestConfig c).hasFlow(_, sink) and
-      sink.hasLocationInfo(file, line, _, _, _) and
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = sink.toString()
    )
  }
@@ -39,7 +39,7 @@ class HttpResponseBodyTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "responsebody" and
    exists(HTTP::ResponseBody rb |
-      rb.hasLocationInfo(file, line, _, _, _) and
+      rb.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = rb.toString() and
      value = "'" + rb.toString() + "'"
    )
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql
@@ -9,7 +9,7 @@ class SQLTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "query" and
    exists(SQL::Query q, SQL::QueryString qs, string qsFile, int qsLine | qs = q.getAQueryString() |
-      q.hasLocationInfo(file, line, _, _, _) and
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      qs.hasLocationInfo(qsFile, qsLine, _, _, _) and
      element = q.toString() and
      value = qs.toString()
@@ -26,7 +26,7 @@ class QueryString extends InlineExpectationsTest {
    tag = "querystring" and
    element = "" and
    exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
-      qs.hasLocationInfo(file, line, _, _, _) and
+      qs.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      value = qs.toString()
    )
  }
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.ql
@@ -8,7 +8,7 @@ class FileSystemAccessTest extends InlineExpectationsTest {

  override predicate hasActualResult(Location location, string element, string tag, string value) {
    exists(FileSystemAccess f |
-      f.hasLocationInfo(file, line, _, _, _) and
+      f.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = f.toString() and
      value = f.getAPathArgument().toString() and
      tag = "fsaccess"
--- a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql
@@ -9,7 +9,7 @@ class TaintFunctionModelTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "ttfnmodelstep" and
    exists(TaintTracking::FunctionModel model, DataFlow::CallNode call | call = model.getACall() |
-      call.hasLocationInfo(file, line, _, _, _) and
+      call.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = call.toString() and
      value = "\"" + model.getAnInputNode(call) + " -> " + model.getAnOutputNode(call) + "\""
    )
@@ -24,7 +24,7 @@ class MarshalerTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "marshaler" and
    exists(MarshalingFunction m, DataFlow::CallNode call | call = m.getACall() |
-      call.hasLocationInfo(file, line, _, _, _) and
+      call.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = call.toString() and
      value =
        "\"" + m.getFormat() + ": " + m.getAnInput().getNode(call) + " -> " +
@@ -41,7 +41,7 @@ class UnmarshalerTest extends InlineExpectationsTest {
  override predicate hasActualResult(Location location, string element, string tag, string value) {
    tag = "unmarshaler" and
    exists(UnmarshalingFunction m, DataFlow::CallNode call | call = m.getACall() |
-      call.hasLocationInfo(file, line, _, _, _) and
+      call.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
      element = call.toString() and
      value =
        "\"" + m.getFormat() + ": " + m.getAnInput().getNode(call) + " -> " +
--- a/go/ql/test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql
@@ -23,7 +23,7 @@ class ZapTest extends InlineExpectationsTest {
    exists(DataFlow::Node sink | any(TestConfig c).hasFlow(_, sink) |
      element = sink.toString() and
      value = "\"" + sink.toString() + "\"" and
-      sink.hasLocationInfo(file, line, _, _, _)
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(), location.getStartColumn(), location.getEndLine(), location.getEndColumn())
    )
  }
 }