diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt index 8e605725199..15fe72bc74e 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt @@ -83,7 +83,7 @@ fun AbstractSerialGenerator.getSerialTypeInfo(property: SerializableProperty): S } else -> { val serializer = - findTypeSerializerOrContext(property.module, property.type, property.descriptor.annotations, property.descriptor.findPsi()) + findTypeSerializerOrContext(property.module, property.type, property.descriptor.findPsi()) SerializableInfo(serializer) } } @@ -108,11 +108,11 @@ fun analyzeSpecialSerializers( fun AbstractSerialGenerator.findTypeSerializerOrContext( module: ModuleDescriptor, kType: KotlinType, - annotations: Annotations = kType.annotations, sourceElement: PsiElement? = null ): ClassDescriptor? { + val annotations = kType.annotations if (kType.isTypeParameter()) return null - if (kType.isMarkedNullable) return findTypeSerializerOrContext(module, kType.makeNotNullable(), annotations, sourceElement) + if (kType.isMarkedNullable) return findTypeSerializerOrContext(module, kType.makeNotNullable(), sourceElement) annotations.serializableWith(module)?.let { return it.toClassDescriptor } additionalSerializersInScopeOfCurrentFile[kType]?.let { return it } if (kType in contextualKClassListInCurrentFile) return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt index a20793e5b0f..fa45ebae57c 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt @@ -451,7 +451,6 @@ interface IrBuilderExtension { ?: if (!property.type.isTypeParameter()) generator.findTypeSerializerOrContext( property.module, property.type, - property.descriptor.annotations, property.descriptor.findPsi() ) else null return serializerInstance( diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt index d99452959ee..0bf77313acc 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt @@ -124,7 +124,6 @@ internal fun SerializerJsTranslator.serializerTower(property: SerializableProper ?: if (!property.type.isTypeParameter()) findTypeSerializerOrContext( property.module, property.type, - property.descriptor.annotations, property.descriptor.findPsi() ) else null return serializerInstance(serializer, property.module, property.type, property.genericIndex) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/JVMCodegenUtil.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/JVMCodegenUtil.kt index 6c8ac6aa126..9c1dbcbb15f 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/JVMCodegenUtil.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/JVMCodegenUtil.kt @@ -191,7 +191,6 @@ internal fun InstructionAdapter.stackValueSerializerInstanceFromSerializerWithou ?: if (!property.type.isTypeParameter()) serializerCodegen.findTypeSerializerOrContext( property.module, property.type, - property.descriptor.annotations, property.descriptor.findPsi() ) else null return serializerCodegen.stackValueSerializerInstance( @@ -382,7 +381,6 @@ fun AbstractSerialGenerator.getSerialTypeInfo(property: SerializableProperty, ty ?: findTypeSerializerOrContext( property.module, property.type, - property.descriptor.annotations, property.descriptor.findPsi() ) return JVMSerialTypeInfo(