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

Adapt serialization exceptions constructor calls to signature change

Browse Source 
(see https://github.com/Kotlin/kotlinx.serialization/pull/1054)
This commit is contained in:
Leonid Startsev
2020-09-09 16:37:10 +03:00
parent fe5dbf75fa
commit eea4ff33a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializableIrGenerator.kt
+3 -4
View File
@@ -15,9 +15,7 @@ import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.impl.IrDelegatingConstructorCallImpl import org.jetbrains.kotlin.ir.expressions.impl.IrDelegatingConstructorCallImpl
import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.types.IrTypeProjection
import org.jetbrains.kotlin.ir.types.classOrNull
import org.jetbrains.kotlin.ir.util.getAnnotation import org.jetbrains.kotlin.ir.util.getAnnotation
import org.jetbrains.kotlin.ir.util.patchDeclarationParents import org.jetbrains.kotlin.ir.util.patchDeclarationParents
import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
@@ -55,7 +53,8 @@ class SerializableIrGenerator(
// Missing field exception parts // Missing field exception parts
val exceptionFqn = getSerializationPackageFqn(MISSING_FIELD_EXC) val exceptionFqn = getSerializationPackageFqn(MISSING_FIELD_EXC)
val exceptionCtorRef = compilerContext.referenceConstructors(exceptionFqn).single { it.owner.isPrimary } val exceptionCtorRef = compilerContext.referenceConstructors(exceptionFqn)
.single { it.owner.valueParameters.singleOrNull()?.type?.isString() == true }
val exceptionType = exceptionCtorRef.owner.returnType val exceptionType = exceptionCtorRef.owner.returnType
val serializableProperties = properties.serializableProperties val serializableProperties = properties.serializableProperties
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
+2 -1
View File
@@ -452,7 +452,8 @@ open class SerializerIrGenerator(val irClass: IrClass, final override val compil
// throw exception on unknown field // throw exception on unknown field
val exceptionFqn = getSerializationPackageFqn(UNKNOWN_FIELD_EXC) val exceptionFqn = getSerializationPackageFqn(UNKNOWN_FIELD_EXC)
val excClassRef = compilerContext.referenceConstructors(exceptionFqn).single { it.owner.isPrimary } val excClassRef = compilerContext.referenceConstructors(exceptionFqn)
.single { it.owner.valueParameters.singleOrNull()?.type?.isInt() == true }
+elseBranch( +elseBranch(
irThrow( irThrow(
irInvoke( irInvoke(