Replace DbLocation with Location

Author: owen-mc

go/ql/lib/semmle/go/DiagnosticsReporting.qll

@@ -1,7 +1,6 @@
 /** Provides classes for working with errors and warnings recorded during extraction. */
 
 import go
-private import semmle.go.internal.Locations
 
 /** Gets the SARIF severity level that indicates an error. */
 private int getErrorSeverity() { result = 2 }
@@ -30,7 +29,9 @@ private class Diagnostic extends @diagnostic {
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
   predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
-    getDiagnosticLocation(this).hasLocationInfo(path, sl, sc, el, ec)
+    exists(Location loc | diagnostics(this, _, _, _, _, loc) |
+      loc.hasLocationInfo(path, sl, sc, el, ec)
+    )
   }
 
   string toString() { result = this.getMessage() }

go/ql/lib/semmle/go/Locations.qll

@@ -1,7 +1,6 @@
 /** Provides classes for working with locations and program elements that have locations. */
 
 import go
-private import internal.Locations
 
 /**
  * A location as given by a file, a start line, a start column,
@@ -11,21 +10,21 @@ private import internal.Locations
  *
  * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
  */
-class DbLocation extends TDbLocation {
+class Location extends @location {
   /** Gets the file for this location. */
-  File getFile() { dbLocationInfo(this, result, _, _, _, _) }
+  File getFile() { locations_default(this, result, _, _, _, _) }
 
   /** Gets the 1-based line number (inclusive) where this location starts. */
-  int getStartLine() { dbLocationInfo(this, _, result, _, _, _) }
+  int getStartLine() { locations_default(this, _, result, _, _, _) }
 
   /** Gets the 1-based column number (inclusive) where this location starts. */
-  int getStartColumn() { dbLocationInfo(this, _, _, result, _, _) }
+  int getStartColumn() { locations_default(this, _, _, result, _, _) }
 
   /** Gets the 1-based line number (inclusive) where this location ends. */
-  int getEndLine() { dbLocationInfo(this, _, _, _, result, _) }
+  int getEndLine() { locations_default(this, _, _, _, result, _) }
 
   /** Gets the 1-based column number (inclusive) where this location ends. */
-  int getEndColumn() { dbLocationInfo(this, _, _, _, _, result) }
+  int getEndColumn() { locations_default(this, _, _, _, _, result) }
 
   /** Gets the number of lines covered by this location. */
   int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
@@ -48,22 +47,22 @@ class DbLocation extends TDbLocation {
   predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
-    exists(File f |
-      dbLocationInfo(this, f, startline, startcolumn, endline, endcolumn) and
+    exists(File f | locations_default(this, f, startline, startcolumn, endline, endcolumn) |
       filepath = f.getAbsolutePath()
     )
   }
 }
 
-final class Location = LocationImpl;
-
 /** A program element with a location. */
 class Locatable extends @locatable {
   /** Gets the file this program element comes from. */
   File getFile() { result = this.getLocation().getFile() }
 
   /** Gets this element's location. */
-  final DbLocation getLocation() { result = getLocatableLocation(this) }
+  final Location getLocation() {
+    has_location(this, result) or
+    xmllocations(this, result)
+  }
 
   /** Gets the number of lines covered by this element. */
   int getNumLines() { result = this.getLocation().getNumLines() }

go/ql/lib/semmle/go/internal/Locations.qll

@@ -1,5 +1,4 @@
 import go
-private import semmle.go.internal.Locations
 
 bindingset[path]
 string baseName(string path) { result = path.regexpCapture(".*(/|\\\\)([^/\\\\]+)(/|\\\\)?$", 2) }
@@ -31,12 +30,7 @@ class Diagnostic extends @diagnostic {
     diagnostic_for(this, c, fileNum, idx)
   }
 
-  DbLocation getLocation() {
-    exists(@location loc |
-      diagnostics(this, _, _, _, _, loc) and
-      result = TDbLocation(loc)
-    )
-  }
+  Location getLocation() { diagnostics(this, _, _, _, _, result) }
 
   // string getTag() {
   //   diagnostics(this, _, result, _, _, _)

go/ql/test/extractor-tests/diagnostics/Diagnostics.ql

@@ -5,7 +5,7 @@ int countDecls(Entity e) { result = count(Ident decl | decl = e.getDeclaration()
 query predicate entities(string fp, Entity e, int c, Type ty) {
   c = countDecls(e) and
   ty = e.getType() and
-  exists(DbLocation loc |
+  exists(Location loc |
     loc = e.getDeclaration().getLocation() and
     fp = loc.getFile().getBaseName() and
     fp = "aliases.go"