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

[FIR] Turn some checkers into classes to prevent memory leaks

Browse Source 
This is temporary solution until those checkers will be fixed
#KT-46058
This commit is contained in:
Dmitriy Novozhilov
2021-04-14 13:24:35 +03:00
parent 085bddbfc0
commit dd96c3b56e
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInapplicableLateinitChecker.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.types.ConeTypeParameterType
import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.isNullable import org.jetbrains.kotlin.fir.types.isNullable
object FirInapplicableLateinitChecker : FirPropertyChecker() { class FirInapplicableLateinitChecker : FirPropertyChecker() {
var primitives: Set<ConeKotlinType>? = null var primitives: Set<ConeKotlinType>? = null
private fun getPrimitiveTypes(context: CheckerContext) = primitives ?: mutableSetOf<ConeKotlinType>().apply { private fun getPrimitiveTypes(context: CheckerContext) = primitives ?: mutableSetOf<ConeKotlinType>().apply {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineClassDeclarationChecker.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.types.AbstractTypeChecker import org.jetbrains.kotlin.types.AbstractTypeChecker
object FirInlineClassDeclarationChecker : FirRegularClassChecker() { class FirInlineClassDeclarationChecker : FirRegularClassChecker() {
private val reservedFunctionNames = setOf("box", "unbox", "equals", "hashCode") private val reservedFunctionNames = setOf("box", "unbox", "equals", "hashCode")
private val kotlinCloneableType = ClassId.fromString("kotlin/Cloneable").constructClassLikeType(emptyArray(), false) private val kotlinCloneableType = ClassId.fromString("kotlin/Cloneable").constructClassLikeType(emptyArray(), false)
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt
+1 -1
View File
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.resolve.symbolProvider
import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.addToStdlib.safeAs
object FirMethodOfAnyImplementedInInterfaceChecker : FirRegularClassChecker(), FirDeclarationPresenter { class FirMethodOfAnyImplementedInInterfaceChecker : FirRegularClassChecker(), FirDeclarationPresenter {
private var inspector: FirDeclarationInspector? = null private var inspector: FirDeclarationInspector? = null
private fun getInspector(context: CheckerContext) = inspector ?: FirDeclarationInspector(this).apply { private fun getInspector(context: CheckerContext) = inspector ?: FirDeclarationInspector(this).apply {
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/checkers/CommonDeclarationCheckers.kt
+3 -3
View File
@@ -45,7 +45,7 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
override val propertyCheckers: Set<FirPropertyChecker> override val propertyCheckers: Set<FirPropertyChecker>
get() = setOf( get() = setOf(
FirInapplicableLateinitChecker, FirInapplicableLateinitChecker(),
FirDestructuringDeclarationChecker, FirDestructuringDeclarationChecker,
FirConstPropertyChecker, FirConstPropertyChecker,
FirPropertyAccessorChecker, FirPropertyAccessorChecker,
@@ -72,14 +72,14 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
FirInterfaceWithSuperclassChecker, FirInterfaceWithSuperclassChecker,
FirLocalEntityNotAllowedChecker, FirLocalEntityNotAllowedChecker,
FirManyCompanionObjectsChecker, FirManyCompanionObjectsChecker,
FirMethodOfAnyImplementedInInterfaceChecker, FirMethodOfAnyImplementedInInterfaceChecker(),
FirDataClassPrimaryConstructorChecker, FirDataClassPrimaryConstructorChecker,
FirPrimaryConstructorSuperTypeChecker, FirPrimaryConstructorSuperTypeChecker,
FirTypeParametersInObjectChecker, FirTypeParametersInObjectChecker,
FirMemberFunctionsChecker, FirMemberFunctionsChecker,
FirMemberPropertiesChecker, FirMemberPropertiesChecker,
FirNestedClassChecker, FirNestedClassChecker,
FirInlineClassDeclarationChecker, FirInlineClassDeclarationChecker(),
) )
override val constructorCheckers: Set<FirConstructorChecker> override val constructorCheckers: Set<FirConstructorChecker>