Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore fix #1599 #3143

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Restore fix #1599 #3143

merged 1 commit into from
Sep 5, 2023

Conversation

vmishenev
Copy link
Contributor

#3034 broke the fix #1599

@vmishenev vmishenev marked this pull request as draft August 25, 2023 01:22
@vmishenev vmishenev marked this pull request as ready for review August 31, 2023 18:53
// the main idea of this class is for each package to store roots which contains it to avoid excessive file system traversal
internal class JvmDependenciesIndexImpl(_roots: List<JavaRoot>) : JvmDependenciesIndex {
class JvmDependenciesIndexImpl(_roots: List<JavaRoot>) : JvmDependenciesIndex {
private val lock = ReentrantLock()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note as it wasn't obvious for me until I asked Vadim about it: these classes were copy-pasted from the compiler (or, rather, the copy-paste was updated). So this change with adding ReentrantLock is coming from there:

https://github.com/JetBrains/kotlin/blob/979d1b085a757c3a99629d33d7046717512a1750/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt#L23

I hope they tested it well and it won't introduce more performance regressions or other types of concurrency issues 🤞

@IgnatBeresnev IgnatBeresnev merged commit 2090723 into master Sep 5, 2023
9 checks passed
@IgnatBeresnev IgnatBeresnev deleted the restore-fix-1599 branch September 5, 2023 12:48
IgnatBeresnev added a commit that referenced this pull request Sep 5, 2023
#3143 wasn't based on latest master, so the checks were green, but then the compilation failed due to explicit API mode
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Parsing java has failures in hashing
2 participants