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

[Stubs] Fix contract deserialization for non-JVM stubs

Browse Source 
Types serialized via type table weren't deserialized, which led to
missing contract information in stubs.

KTIJ-28668
This commit is contained in:
Pavel Kirpichenkov
2024-02-21 20:01:36 +02:00
committed by Space Team
parent 9373437cad
commit bfb1ef14f5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/Contracts/Contracts.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
/* KTIJ-28668 */
// KNM_K2_IGNORE
// JVM_FILE_NAME: ContractsKt // JVM_FILE_NAME: ContractsKt
@file:OptIn(ExperimentalContracts::class) @file:OptIn(ExperimentalContracts::class)
analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClsContractBuilder.kt
+5 -3
View File
@@ -16,6 +16,8 @@ import org.jetbrains.kotlin.psi.stubs.impl.*
import org.jetbrains.kotlin.psi.stubs.impl.KotlinContractEffectType.Companion.IGNORE_REFERENCE_PARAMETER_NAME import org.jetbrains.kotlin.psi.stubs.impl.KotlinContractEffectType.Companion.IGNORE_REFERENCE_PARAMETER_NAME
import org.jetbrains.kotlin.serialization.deserialization.ProtoBufContractDeserializer import org.jetbrains.kotlin.serialization.deserialization.ProtoBufContractDeserializer
import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.getClassId
import org.jetbrains.kotlin.metadata.deserialization.type
import org.jetbrains.kotlin.metadata.deserialization.receiverType
class ClsContractBuilder(private val c: ClsStubBuilderContext, private val typeStubBuilder: TypeClsStubBuilder) : class ClsContractBuilder(private val c: ClsStubBuilderContext, private val typeStubBuilder: TypeClsStubBuilder) :
ProtoBufContractDeserializer<KotlinTypeBean, Nothing?, ProtoBuf.Function>() { ProtoBufContractDeserializer<KotlinTypeBean, Nothing?, ProtoBuf.Function>() {
@@ -26,9 +28,9 @@ class ClsContractBuilder(private val c: ClsStubBuilderContext, private val typeS
override fun extractVariable(valueParameterIndex: Int, owner: ProtoBuf.Function): KtValueParameterReference<KotlinTypeBean, Nothing?> { override fun extractVariable(valueParameterIndex: Int, owner: ProtoBuf.Function): KtValueParameterReference<KotlinTypeBean, Nothing?> {
val type = if (valueParameterIndex < 0) { val type = if (valueParameterIndex < 0) {
owner.receiverType owner.receiverType(c.typeTable)
} else owner.valueParameterList[valueParameterIndex].type } else owner.valueParameterList[valueParameterIndex].type(c.typeTable)
return if (type.hasClassName() && c.nameResolver.getClassId(type.className) == StandardClassIds.Boolean) { return if (type?.hasClassName() == true && c.nameResolver.getClassId(type.className) == StandardClassIds.Boolean) {
KtBooleanValueParameterReference(valueParameterIndex, name = IGNORE_REFERENCE_PARAMETER_NAME) KtBooleanValueParameterReference(valueParameterIndex, name = IGNORE_REFERENCE_PARAMETER_NAME)
} else KtValueParameterReference(valueParameterIndex, name = IGNORE_REFERENCE_PARAMETER_NAME) } else KtValueParameterReference(valueParameterIndex, name = IGNORE_REFERENCE_PARAMETER_NAME)
} }