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

KtLazyLightClass: do not store references to LightClassDataHolder

Browse Source 
Otherwise any cached reference to light class can lead to severe memory leaks in IDE
    since LightClassBuiderResult holds GenerationState which holds ModuleDescriptor
This commit is contained in:
Pavel V. Talanov
2017-04-14 19:07:53 +03:00
parent 3401529be1
commit bea1da5c7a
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLazyLightClass.kt
+2
View File
@@ -16,12 +16,14 @@
package org.jetbrains.kotlin.asJava.classes package org.jetbrains.kotlin.asJava.classes
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiManager import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.asJava.builder.LightClassData import org.jetbrains.kotlin.asJava.builder.LightClassData
abstract class KtLazyLightClass(manager: PsiManager) : KtLightClassBase(manager) { abstract class KtLazyLightClass(manager: PsiManager) : KtLightClassBase(manager) {
abstract val lightClassData: LightClassData abstract val lightClassData: LightClassData
override val clsDelegate: PsiClass by lazyPub { lightClassData.clsDelegate }
override fun getOwnFields() = lightClassData.getOwnFields(this) override fun getOwnFields() = lightClassData.getOwnFields(this)
override fun getOwnMethods() = lightClassData.getOwnMethods(this) override fun getOwnMethods() = lightClassData.getOwnMethods(this)
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt
+2 -6
View File
@@ -194,12 +194,8 @@ class KtLightClassForFacade private constructor(
override fun copy() = KtLightClassForFacade(manager, facadeClassFqName, lightClassDataCache, files) override fun copy() = KtLightClassForFacade(manager, facadeClassFqName, lightClassDataCache, files)
override val lightClassData by lazyPub { override val lightClassData
lightClassDataCache.value.findDataForFacade(facadeClassFqName) get() = lightClassDataCache.value.findDataForFacade(facadeClassFqName)
}
override val clsDelegate: PsiClass
get() = lightClassData.clsDelegate
override fun getNavigationElement() = files.iterator().next() override fun getNavigationElement() = files.iterator().next()
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+2 -3
View File
@@ -78,9 +78,8 @@ abstract class KtLightClassForSourceDeclaration(protected val classOrObject: KtC
abstract override fun getParent(): PsiElement? abstract override fun getParent(): PsiElement?
abstract override fun getQualifiedName(): String? abstract override fun getQualifiedName(): String?
override val clsDelegate: PsiClass get() = lightClassData.clsDelegate override val lightClassData: LightClassData
get() = findLightClassData()
override val lightClassData: LightClassData by lazyPub { findLightClassData() }
open protected fun findLightClassData() = getLightClassDataHolder().findDataForClassOrObject(classOrObject) open protected fun findLightClassData() = getLightClassDataHolder().findDataForClassOrObject(classOrObject)