From 5f2cea917f7ec74b2bdab2818ebc700a80b6e43f Mon Sep 17 00:00:00 2001
From: Leonid Startsev <leonid.startsev@jetbrains.com>
Date: Mon, 26 Nov 2018 16:21:20 +0300
Subject: [PATCH] Remove redundant check for 'all parameters are properties' in
 a case of fully-customized serializer

---
 .../backend/common/SerializerCodegen.kt       | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/SerializerCodegen.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/SerializerCodegen.kt
index 03f0b8fe406..356768b5c13 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/SerializerCodegen.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/SerializerCodegen.kt
@@ -35,8 +35,13 @@ abstract class SerializerCodegen(
     protected val properties = SerializableProperties(serializableDescriptor, bindingContext)
     protected val orderedProperties = properties.serializableProperties
 
+    private fun checkSerializability() {
+        check(properties.isExternallySerializable) {
+            "Class ${serializableDescriptor.name} have constructor parameters which are not properties and therefore it is not serializable automatically"
+        }
+    }
+
     fun generate() {
-        check(properties.isExternallySerializable) { "Class ${serializableDescriptor.name} is not externally serializable" }
         val prop = generateSerializableClassPropertyIfNeeded()
         if (prop)
             generateSerialDesc()
@@ -98,31 +103,38 @@ abstract class SerializerCodegen(
 
     private fun generateSerializableClassPropertyIfNeeded(): Boolean {
         val property = generatedSerialDescPropertyDescriptor
-                       ?: return false
+            ?: return false
+        checkSerializability()
         generateSerializableClassProperty(property)
         return true
     }
 
     private fun generateSaveIfNeeded(): Boolean {
-        val function = getMemberToGenerate(serializerDescriptor, SerialEntityNames.SAVE,
-                                           serializerDescriptor::checkSaveMethodResult, serializerDescriptor::checkSaveMethodParameters)
-                       ?: return false
+        val function = getMemberToGenerate(
+            serializerDescriptor, SerialEntityNames.SAVE,
+            serializerDescriptor::checkSaveMethodResult, serializerDescriptor::checkSaveMethodParameters
+        )
+            ?: return false
+        checkSerializability()
         generateSave(function)
         return true
     }
 
     private fun generateLoadIfNeeded(): Boolean {
-        val function = getMemberToGenerate(serializerDescriptor, SerialEntityNames.LOAD,
-                                           serializerDescriptor::checkLoadMethodResult, serializerDescriptor::checkLoadMethodParameters)
-                       ?: return false
+        val function = getMemberToGenerate(
+            serializerDescriptor, SerialEntityNames.LOAD,
+            serializerDescriptor::checkLoadMethodResult, serializerDescriptor::checkLoadMethodParameters
+        )
+            ?: return false
+        checkSerializability()
         generateLoad(function)
         return true
     }
 
-    fun getPropertyToGenerate(
-            classDescriptor: ClassDescriptor,
-            name: String,
-            isReturnTypeOk: (PropertyDescriptor) -> Boolean
+    private fun getPropertyToGenerate(
+        classDescriptor: ClassDescriptor,
+        name: String,
+        isReturnTypeOk: (PropertyDescriptor) -> Boolean
     ): PropertyDescriptor? = getProperty(
         classDescriptor,
         name,
@@ -131,7 +143,7 @@ abstract class SerializerCodegen(
         kind == CallableMemberDescriptor.Kind.SYNTHESIZED || kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE
     }
 
-    fun getProperty(
+    private fun getProperty(
         classDescriptor: ClassDescriptor,
         name: String,
         isReturnTypeOk: (PropertyDescriptor) -> Boolean,
@@ -147,5 +159,5 @@ abstract class SerializerCodegen(
         }
 
     protected fun ClassDescriptor.getFuncDesc(funcName: String): Sequence<FunctionDescriptor> =
-            unsubstitutedMemberScope.getDescriptorsFiltered { it == Name.identifier(funcName) }.asSequence().filterIsInstance<FunctionDescriptor>()
+        unsubstitutedMemberScope.getDescriptorsFiltered { it == Name.identifier(funcName) }.asSequence().filterIsInstance<FunctionDescriptor>()
 }