From 3de78fcdc64450fafcd8fb1f15b0e51fb2c2ea41 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Tue, 9 Jul 2024 17:26:08 +0200
Subject: [PATCH] libclang: do not make error locations relative

This is done at a later time anyway, so doesn't need to be done in the
cgo package. In fact, _not_ doing it there makes it easier to print
correct relative packages.
---
 cgo/libclang.go        | 7 -------
 testdata/errors/cgo.go | 7 ++-----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/cgo/libclang.go b/cgo/libclang.go
index 0860c6af4..12f75029b 100644
--- a/cgo/libclang.go
+++ b/cgo/libclang.go
@@ -642,13 +642,6 @@ func (p *cgoPackage) addErrorAfter(pos token.Pos, after, msg string) {
 
 // addErrorAt is a utility function to add an error to the list of errors.
 func (p *cgoPackage) addErrorAt(position token.Position, msg string) {
-	if filepath.IsAbs(position.Filename) {
-		// Relative paths for readability, like other Go parser errors.
-		relpath, err := filepath.Rel(p.currentDir, position.Filename)
-		if err == nil {
-			position.Filename = relpath
-		}
-	}
 	p.errors = append(p.errors, scanner.Error{
 		Pos: position,
 		Msg: msg,
diff --git a/testdata/errors/cgo.go b/testdata/errors/cgo.go
index e0853cc85..ce18278a9 100644
--- a/testdata/errors/cgo.go
+++ b/testdata/errors/cgo.go
@@ -7,9 +7,6 @@ import "C"
 func main() {
 }
 
-// TODO: this error should be relative to the current directory (so cgo.go
-// instead of testdata/errors/cgo.go).
-
 // ERROR: # command-line-arguments
-// ERROR: testdata/errors/cgo.go:3:5: error: hello
-// ERROR: testdata/errors/cgo.go:4:4: error: expected identifier or '('
+// ERROR: cgo.go:3:5: error: hello
+// ERROR: cgo.go:4:4: error: expected identifier or '('