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

Make intrinsics more consistent with reflective serializer() lookup

Browse Source 
Intrinsic should not look into use-site `@Serializable(with)` annotations.

#KT-64920 Fixed
This commit is contained in:
Leonid Startsev
2024-03-13 19:16:21 +01:00
committed by Space Team
parent a781a08386
commit 69ad68ca83
5 changed files with 110 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializationJvmIrIntrinsicSupport.kt
+1 -1
View File
@@ -165,7 +165,7 @@ class SerializationJvmIrIntrinsicSupport(
get() = currentVersion != null && currentVersion!! >= ApiVersion.parse("1.2.0")!!
private fun findTypeSerializerOrContext(argType: IrType): IrClassSymbol? =
emptyGenerator.findTypeSerializerOrContextUnchecked(this, argType)
emptyGenerator.findTypeSerializerOrContextUnchecked(this, argType, useTypeAnnotations = false)
private fun instantiateObject(iv: InstructionAdapter, objectSymbol: IrClassSymbol) {
val originalIrClass = objectSymbol.owner
plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerSearchUtil.kt
+5 -5
View File
@@ -85,17 +85,17 @@ fun BaseIrGenerator?.findTypeSerializerOrContext(
}
fun BaseIrGenerator?.findTypeSerializerOrContextUnchecked(
context: SerializationBaseContext, kType: IrType
context: SerializationBaseContext, kType: IrType, useTypeAnnotations: Boolean = true
): IrClassSymbol? {
val annotations = kType.annotations
if (kType.isTypeParameter()) return null
val annotations = if (useTypeAnnotations) kType.annotations else emptyList()
annotations.serializableWith()?.let { return it }
this?.additionalSerializersInScopeOfCurrentFile?.get(kType.classOrNull!! to kType.isNullable())?.let {
return it
}
if (kType.isMarkedNullable()) return findTypeSerializerOrContextUnchecked(context, kType.makeNotNull())
if (this?.contextualKClassListInCurrentFile?.contains(kType.classOrNull) == true) return context.referenceClassId(contextSerializerId)
return analyzeSpecialSerializers(context, annotations) ?: findTypeSerializer(context, kType)
return analyzeSpecialSerializers(context, annotations) ?: findTypeSerializer(context, kType, useTypeAnnotations)
}
fun analyzeSpecialSerializers(
@@ -111,8 +111,8 @@ fun analyzeSpecialSerializers(
}
fun findTypeSerializer(context: SerializationBaseContext, type: IrType): IrClassSymbol? {
type.overriddenSerializer?.let { return it }
fun findTypeSerializer(context: SerializationBaseContext, type: IrType, useTypeAnnotations: Boolean = true): IrClassSymbol? {
if (useTypeAnnotations) type.overriddenSerializer?.let { return it }
if (type.isTypeParameter()) return null
if (type.isArray()) return context.referenceClassId(referenceArraySerializerId)
if (type.isGeneratedSerializableObject()) return context.referenceClassId(objectSerializerId)