Fix classpath options #2269
Merged
Fix classpath options #2269
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adpi2
commented
Feb 12, 2024
| @@ -50,19 +50,21 @@ final class CompilerCache( | |||
| logger: Logger | |||
| ) { | |||
|
|
|||
| private val scalaCompilerCache = new ConcurrentHashMap[ScalaInstance, ScalaCompiler]() | |||
|
|
|||
| private val scalaInstanceCache = new ConcurrentHashMap[ScalaInstance, ScalaInstance]() | |||
There was a problem hiding this comment.
Cache the ScalaInstance instead of the ScalaCompiler because two projects can have the same ScalaInstance but different ClasspathOptions.
rochala
approved these changes
Feb 13, 2024
| javacBin: Option[AbsolutePath], | ||
| javacOptions: List[String] | ||
| ): Compilers = { | ||
| val scalaCompiler = scalaCompilerCache.computeIfAbsent( | ||
| val scalaInstanceFromCache = scalaInstanceCache.computeIfAbsent( |
There was a problem hiding this comment.
We don't need this cache any more, we can pass Scala instance directly
There was a problem hiding this comment.
No we really need it. It deduplicates ScalaInstance that are equal but not reference equal. The goal is to avoid using the class loaders from new ScalaInstance that are equal to old ones.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #2268
We should cache the
ScalaInstanceto reuse classloaders as much as possible but we should take into account theClasspathOptionsof a project when we create theScalaCompiler.Tested on Dotty: compilation ✔️ auto-completion ✔️