Fix serialization for suspend function types.

Since now `suspend (Int) -> String` will be serialized as `(Int, Continuation<String>) -> Any?` + suspend flag.

Before this change such type serialized like this: Function2<Int, String> + suspend flag. And yes, type `Function2<Int, String>` isn't correct, because Function2 expect 3 type arguments.
We have special logic for this case and we deserialize such error-written types correctly.

(cherry picked from commit 3518cbe)

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt

@@ -32,7 +32,7 @@ class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
         var skipCheck: Boolean = false
 
         @JvmField
-        val INSTANCE = JvmMetadataVersion(1, 1, 4)
+        val INSTANCE = JvmMetadataVersion(1, 1, 5)
 
         @JvmField
         val INVALID_VERSION = JvmMetadataVersion()

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt

@@ -64,22 +64,6 @@ interface TypeMappingConfiguration<out T : Any> {
 
 const val NON_EXISTENT_CLASS_NAME = "error/NonExistentClass"
 
-private val FAKE_CONTINUATION_CLASS_DESCRIPTOR =
-        MutableClassDescriptor(
-                ErrorUtils.getErrorModule(),
-                ClassKind.INTERFACE, /* isInner = */ false, /* isExternal = */ false,
-                DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME.shortName(), SourceElement.NO_SOURCE
-        ).apply {
-            modality = Modality.ABSTRACT
-            visibility = Visibilities.PUBLIC
-            setTypeParameterDescriptors(
-                TypeParameterDescriptorImpl.createWithDefaultBound(
-                      this, Annotations.EMPTY, false, Variance.IN_VARIANCE, Name.identifier("T"), 0
-                ).let(::listOf)
-            )
-            createTypeConstructor()
-        }
-
 private val CONTINUATION_INTERNAL_NAME =
         JvmClassName.byClassId(ClassId.topLevel(DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME)).internalName
 
@@ -93,23 +77,7 @@ fun <T : Any> mapType(
 ): T {
     if (kotlinType.isSuspendFunctionType) {
         return mapType(
-                createFunctionType(
-                        kotlinType.builtIns,
-                        kotlinType.annotations,
-                        kotlinType.getReceiverTypeFromFunctionType(),
-                        kotlinType.getValueParameterTypesFromFunctionType().map(TypeProjection::getType) +
-                            KotlinTypeFactory.simpleType(
-                                    Annotations.EMPTY,
-                                    // Continuation interface is not a part of built-ins anymore, it has been moved to stdlib.
-                                    // While it must be somewhere in the dependencies, but here we don't have a reference to the module,
-                                    // and it's rather complicated to inject it by now, so we just use a fake class descriptor.
-                                    FAKE_CONTINUATION_CLASS_DESCRIPTOR.typeConstructor,
-                                    listOf(kotlinType.getReturnTypeFromFunctionType().asTypeProjection()), nullable = false
-                            ),
-                        // TODO: names
-                        null,
-                        kotlinType.builtIns.nullableAnyType
-                ),
+                transformSuspendFunctionToRuntimeFunctionType(kotlinType),
                 factory, mode, typeMappingConfiguration, descriptorTypeWriter,
                 writeGenericType
         )