azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ResolveElementCache: Use softly (not weakly) retained values

Browse Source 
Fixes performance problems with long running searches analyzing function bodies several times
This commit is contained in:
Pavel V. Talanov
2015-01-15 18:48:18 +03:00
parent 90e7d2151b
commit 2d68637fd9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java
+2 -2
View File
@@ -22,10 +22,10 @@ import org.jetbrains.kotlin.resolve.BindingTrace;
public interface LazyResolveStorageManager extends StorageManager { public interface LazyResolveStorageManager extends StorageManager {
@NotNull @NotNull
<K, V> MemoizedFunctionToNotNull<K, V> createWeaklyRetainedMemoizedFunction(@NotNull Function1<K, V> compute); <K, V> MemoizedFunctionToNotNull<K, V> createSoftlyRetainedMemoizedFunction(@NotNull Function1<K, V> compute);
@NotNull @NotNull
<K, V> MemoizedFunctionToNullable<K, V> createWeaklyRetainedMemoizedFunctionWithNullableValues(@NotNull Function1<K, V> compute); <K, V> MemoizedFunctionToNullable<K, V> createSoftlyRetainedMemoizedFunctionWithNullableValues(@NotNull Function1<K, V> compute);
@NotNull @NotNull
BindingTrace createSafeTrace(@NotNull BindingTrace originalTrace); BindingTrace createSafeTrace(@NotNull BindingTrace originalTrace);
compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt
+5 -5
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.storage package org.jetbrains.kotlin.storage
import com.intellij.util.containers.ConcurrentWeakValueHashMap
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -24,13 +23,14 @@ import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice
import org.jetbrains.kotlin.util.slicedMap.WritableSlice import org.jetbrains.kotlin.util.slicedMap.WritableSlice
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
import com.intellij.util.containers.ConcurrentSoftValueHashMap
public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager { public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager {
override fun <K, V> createWeaklyRetainedMemoizedFunction(compute: Function1<K, V>) = override fun <K, V> createSoftlyRetainedMemoizedFunction(compute: Function1<K, V>) =
storageManager.createMemoizedFunction<K, V>(compute, ConcurrentWeakValueHashMap<K, Any>()) storageManager.createMemoizedFunction<K, V>(compute, ConcurrentSoftValueHashMap<K, Any>())
override fun <K, V> createWeaklyRetainedMemoizedFunctionWithNullableValues(compute: Function1<K, V>) = override fun <K, V> createSoftlyRetainedMemoizedFunctionWithNullableValues(compute: Function1<K, V>) =
storageManager.createMemoizedFunctionWithNullableValues<K, V>(compute, ConcurrentWeakValueHashMap<K, Any>()) storageManager.createMemoizedFunctionWithNullableValues<K, V>(compute, ConcurrentSoftValueHashMap<K, Any>())
// It seems safe to have a separate lock for traces: // It seems safe to have a separate lock for traces:
// no other locks will be acquired inside the trace operations // no other locks will be acquired inside the trace operations
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class ResolveElementCache extends ElementResolver {
ResolveSession resolveSession = ResolveElementCache.this.resolveSession; ResolveSession resolveSession = ResolveElementCache.this.resolveSession;
LazyResolveStorageManager manager = resolveSession.getStorageManager(); LazyResolveStorageManager manager = resolveSession.getStorageManager();
MemoizedFunctionToNotNull<JetElement, BindingContext> elementsCacheFunction = MemoizedFunctionToNotNull<JetElement, BindingContext> elementsCacheFunction =
manager.createWeaklyRetainedMemoizedFunction(new Function1<JetElement, BindingContext>() { manager.createSoftlyRetainedMemoizedFunction(new Function1<JetElement, BindingContext>() {
@Override @Override
public BindingContext invoke(JetElement jetElement) { public BindingContext invoke(JetElement jetElement) {
return elementAdditionalResolve(jetElement, jetElement, BodyResolveMode.FULL); return elementAdditionalResolve(jetElement, jetElement, BodyResolveMode.FULL);