From 8deab3559eed80f58507c929ce8afa5f7703997c Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 14 Sep 2020 16:19:41 +0300 Subject: [PATCH] [FIR] Get rid of FirDeserializationComponents --- .../fir/deserialization/FirMemberDeserializer.kt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index fe0beb135dc..7884dc8db8d 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -42,8 +42,7 @@ class FirDeserializationContext( val annotationDeserializer: AbstractAnnotationDeserializer, val constDeserializer: FirConstDeserializer, val containerSource: DeserializedContainerSource?, - outerTypeParameters: List, - val components: FirDeserializationComponents + outerTypeParameters: List ) { val allTypeParameters: List = typeDeserializer.ownTypeParameters + outerTypeParameters @@ -62,7 +61,7 @@ class FirDeserializationContext( session, nameResolver, typeTable, typeParameterProtos, typeDeserializer ), annotationDeserializer, constDeserializer, containerSource, - if (capturesTypeParameters) allTypeParameters else emptyList(), components + if (capturesTypeParameters) allTypeParameters else emptyList() ) val memberDeserializer: FirMemberDeserializer = FirMemberDeserializer(this) @@ -138,18 +137,12 @@ class FirDeserializationContext( annotationDeserializer, constDeserializer, containerSource, - emptyList(), - FirDeserializationComponents() + emptyList() ) } } } -// TODO: Move something here -class FirDeserializationComponents { - -} - class FirMemberDeserializer(private val c: FirDeserializationContext) { private val contractDeserializer = FirContractDeserializer(c)