luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.x] perf: Stop re-converting the classpath in compileOptions (#9622) 

Both compileOptions sites mapped the whole classpath through
converter.toPath -> converter.toVirtualFile. Going through toPath
defeats FileConverter.toVirtualFile(VirtualFileRef), which already
returns the ref unchanged when it is a VirtualFile, so every entry was
rebuilt from scratch. For a class directory that means walking the
entire output tree, once per dependent.

backendOutput is converted explicitly because it is a settingKey
evaluated once at project load, so reusing it would pin the listing
taken before anything compiled.

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Mai Huy Hoàng 2026-08-18 22:40:54 +07:00 committed by GitHub
parent 8c76375eab
commit a1114188b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Defaults.scala
View File

@ -984,9 +984,10 @@ object Defaults extends BuildCommon with DefExtra {
compileOptions := Def.uncached {
val opts = (compile / compileOptions).value
val cp0 = dependencyClasspath.value
val cp1 = backendOutput.value +: data(cp0)
val converter = fileConverter.value
val cp = cp1.map(converter.toPath).map(converter.toVirtualFile)
// backendOutput is a settingKey: its listing is captured at project load, so re-convert
val cp = converter.toVirtualFile(converter.toPath(backendOutput.value)) +:
data(cp0).map(converter.toVirtualFile)
opts.withClasspath(cp.toArray)
},
compileInputs2 := Def.uncached {
@ -2469,8 +2470,8 @@ object Defaults extends BuildCommon with DefExtra {
compileOptions := Def.uncached {
val c = fileConverter.value
val cp0 = classpathTask.value
val cp1 = backendOutput.value +: data(cp0)
val cp = cp1.map(c.toPath).map(c.toVirtualFile)
// backendOutput is a settingKey: its listing is captured at project load, so re-convert
val cp = c.toVirtualFile(c.toPath(backendOutput.value)) +: data(cp0).map(c.toVirtualFile)
val vs0 = sourcesVF.value
val vs = vs0.toVector.map: x =>
c.toVirtualFile(c.toPath(x))