Merge pull request #1490 from ahoppen/resolve-symlinks-toolchain-txt

ahoppen · web-flow · commit acabb1d40623 · 2024-06-18T15:22:13.000-07:00
Resolve symlinks in toolchain path when creating sourcekitd reproducer bundle
diff --git a/Sources/Diagnose/ReproducerBundle.swift b/Sources/Diagnose/ReproducerBundle.swift
@@ -26,7 +26,7 @@ func makeReproducerBundle(for requestInfo: RequestInfo, toolchain: Toolchain, bu
     encoding: .utf8
   )
   if let toolchainPath = toolchain.path {
-    try toolchainPath.pathString
+    try toolchainPath.asURL.resolvingSymlinksInPath().path
       .write(
         to: bundlePath.appendingPathComponent("toolchain.txt"),
         atomically: true,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func makeReproducerBundle(for requestInfo: RequestInfo, toolchain: Toolchain, bu`
`26`	`26`	`encoding: .utf8`
`27`	`27`	`)`
`28`	`28`	`if let toolchainPath = toolchain.path {`
`29`		`- try toolchainPath.pathString`
	`29`	`+ try toolchainPath.asURL.resolvingSymlinksInPath().path`
`30`	`30`	`.write(`
`31`	`31`	`to: bundlePath.appendingPathComponent("toolchain.txt"),`
`32`	`32`	`atomically: true,`