From 802366064d025f8f8c3fdad7a2b2a22090b68889 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Wed, 14 Feb 2024 10:14:52 +0100 Subject: [PATCH] [FIR] Expand annotation types in annotation serialization #KT-65659 Fixed --- .../kotlin/fir/serialization/FirAnnotationSerializer.kt | 3 ++- .../org/jetbrains/kotlin/konan/test/blackbox/FrameworkTest.kt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt index 0bb3ba472ec..64812c800c8 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.render +import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.serialization.constant.ConstValueProvider import org.jetbrains.kotlin.fir.serialization.constant.coneTypeSafe @@ -34,7 +35,7 @@ class FirAnnotationSerializer( } fun serializeAnnotation(annotation: AnnotationValue): ProtoBuf.Annotation { - return serializeAnnotation(annotation.coneTypeSafe(), annotation.value.argumentsMapping) + return serializeAnnotation(annotation.coneTypeSafe()?.fullyExpandedType(session), annotation.value.argumentsMapping) } private fun serializeAnnotation(coneType: ConeClassLikeType?, argumentsMapping: Map>): ProtoBuf.Annotation { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/FrameworkTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/FrameworkTest.kt index b6481ad1cba..061da187949 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/FrameworkTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/FrameworkTest.kt @@ -41,7 +41,6 @@ abstract class FrameworkTestBase : AbstractNativeSimpleTest() { private val extras = TestCase.NoTestRunnerExtras("There's no entrypoint in Swift program") private val testCompilationFactory = TestCompilationFactory() - @Disabled("KT-65659 is not yet fixed for K2") @Test fun testKT65659() { Assumptions.assumeTrue(targets.testTarget.family.isAppleFamily)