From c171dafd91cb04b042319d756a2300b12db08736 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 7 Oct 2020 12:24:28 +0300 Subject: [PATCH] FIR serializer: always normalize visibility Without this commit we fail on package-private or so in serializer --- .../kotlin/fir/serialization/FirElementSerializer.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index 0d8f52c79ba..4262004f450 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -824,15 +824,11 @@ class FirElementSerializer private constructor( private fun normalizeVisibility(declaration: FirMemberDeclaration): Visibility { - // It can be necessary for Java classes serialization having package-private visibility - return if (extension.shouldUseNormalizedVisibility()) declaration.visibility.normalize() - else declaration.visibility + return declaration.visibility.normalize() } private fun normalizeVisibility(declaration: FirPropertyAccessor): Visibility { - // It can be necessary for Java classes serialization having package-private visibility - return if (extension.shouldUseNormalizedVisibility()) declaration.visibility.normalize() - else declaration.visibility + return declaration.visibility.normalize() } private fun getClassifierId(declaration: FirClassLikeDeclaration<*>): Int =