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

[KLIB] Use SoftReference to hold proto memory

Browse Source 
- fix metadata memory leak for KT-40345
This commit is contained in:
Roman Artemev
2020-07-31 15:16:45 +03:00
committed by romanart
parent add0ad6733
commit 851c287105
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataPackageFragment.kt
+12 -2
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.getClassId
import org.jetbrains.kotlin.serialization.deserialization.getName import org.jetbrains.kotlin.serialization.deserialization.getName
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import java.lang.ref.SoftReference
class KlibMetadataDeserializedPackageFragment( class KlibMetadataDeserializedPackageFragment(
fqName: FqName, fqName: FqName,
@@ -30,8 +31,17 @@ class KlibMetadataDeserializedPackageFragment(
// The proto field is lazy so that we can load only needed // The proto field is lazy so that we can load only needed
// packages from the library. // packages from the library.
override val protoForNames: ProtoBuf.PackageFragment by lazy { override val protoForNames: ProtoBuf.PackageFragment get() = ensureStorage()
(packageAccessHandler ?: SimplePackageAccessHandler).loadPackageFragment(library, fqName.asString(), partName)
private var protoForNamesStorage: SoftReference<ProtoBuf.PackageFragment> = SoftReference(null)
private fun ensureStorage(): ProtoBuf.PackageFragment {
var tmp = protoForNamesStorage.get()
if (tmp == null) {
tmp = (packageAccessHandler ?: SimplePackageAccessHandler).loadPackageFragment(library, fqName.asString(), partName)
protoForNamesStorage = SoftReference(tmp)
}
return tmp
} }
override val proto: ProtoBuf.PackageFragment override val proto: ProtoBuf.PackageFragment