From 176071b7db87f3fe19462e37575f88b6d77b6442 Mon Sep 17 00:00:00 2001
From: Sergey Shanshin <sergey.shanshin@jetbrains.com>
Date: Tue, 24 Nov 2020 16:34:02 +0300
Subject: [PATCH] Add support of nullable serializers to UseSerializers
 annotation (#3906)

Fixes Kotlin/kotlinx.serialization#984
---
 .../kotlinx/serialization/compiler/backend/common/TypeUtil.kt  | 3 ---
 1 file changed, 3 deletions(-)

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 1fcb94c05d0..48948665f6c 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
@@ -125,9 +125,6 @@ fun AbstractSerialGenerator.findTypeSerializerOrContextUnchecked(
     if (kType.isTypeParameter()) return null
     annotations.serializableWith(module)?.let { return it.toClassDescriptor }
     additionalSerializersInScopeOfCurrentFile[kType]?.let { return it }
-    if (!kType.isMarkedNullable) {
-        additionalSerializersInScopeOfCurrentFile[kType.makeNullable()]?.let { return it }
-    }
 
     if (kType in contextualKClassListInCurrentFile) return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer)
     return analyzeSpecialSerializers(module, annotations) ?: findTypeSerializer(module, kType)