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

[FIR] Expand annotation types in annotation serialization

Browse Source 
#KT-65659 Fixed
This commit is contained in:
Kirill Rakhman
2024-02-14 10:14:52 +01:00
committed by Space Team
parent 243d6aed50
commit 802366064d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt
+2 -1
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotation
import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.languageVersionSettings
import org.jetbrains.kotlin.fir.render 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.resolve.toSymbol
import org.jetbrains.kotlin.fir.serialization.constant.ConstValueProvider import org.jetbrains.kotlin.fir.serialization.constant.ConstValueProvider
import org.jetbrains.kotlin.fir.serialization.constant.coneTypeSafe import org.jetbrains.kotlin.fir.serialization.constant.coneTypeSafe
@@ -34,7 +35,7 @@ class FirAnnotationSerializer(
} }
fun serializeAnnotation(annotation: AnnotationValue): ProtoBuf.Annotation { fun serializeAnnotation(annotation: AnnotationValue): ProtoBuf.Annotation {
return serializeAnnotation(annotation.coneTypeSafe<ConeClassLikeType>(), annotation.value.argumentsMapping) return serializeAnnotation(annotation.coneTypeSafe<ConeClassLikeType>()?.fullyExpandedType(session), annotation.value.argumentsMapping)
} }
private fun serializeAnnotation(coneType: ConeClassLikeType?, argumentsMapping: Map<Name, ConstantValue<*>>): ProtoBuf.Annotation { private fun serializeAnnotation(coneType: ConeClassLikeType?, argumentsMapping: Map<Name, ConstantValue<*>>): ProtoBuf.Annotation {
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/FrameworkTest.kt
-1
View File
@@ -41,7 +41,6 @@ abstract class FrameworkTestBase : AbstractNativeSimpleTest() {
private val extras = TestCase.NoTestRunnerExtras("There's no entrypoint in Swift program") private val extras = TestCase.NoTestRunnerExtras("There's no entrypoint in Swift program")
private val testCompilationFactory = TestCompilationFactory() private val testCompilationFactory = TestCompilationFactory()
@Disabled("KT-65659 is not yet fixed for K2")
@Test @Test
fun testKT65659() { fun testKT65659() {
Assumptions.assumeTrue(targets.testTarget.family.isAppleFamily) Assumptions.assumeTrue(targets.testTarget.family.isAppleFamily)