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

JVM_IR: special case for raw types in DescriptorMangleComputer

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-09-11 22:34:25 +03:00
committed by teamcityserver
parent 247cbffbac
commit 64e2911b58
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
+1 -1
View File
@@ -206,7 +206,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
val lower = type.lowerBound val lower = type.lowerBound
val lowerDescriptor = lower.constructor.declarationDescriptor as? ClassDescriptor val lowerDescriptor = lower.constructor.declarationDescriptor as? ClassDescriptor
?: error("No class descriptor for lower type $lower of $type") ?: error("No class descriptor for lower type $lower of $type")
val intermediate = if (lowerDescriptor == upperDescriptor) { val intermediate = if (lowerDescriptor == upperDescriptor && type !is RawType) {
lower.replace(newArguments = upper.arguments) lower.replace(newArguments = upper.arguments)
} else lower } else lower
val mixed = intermediate.makeNullableAsSpecified(upper.isMarkedNullable) val mixed = intermediate.makeNullableAsSpecified(upper.isMarkedNullable)
compiler/testData/codegen/boxInline/signatureMangling/rawType.kt
Vendored
+15 -9
View File
@@ -1,16 +1,22 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// FILE: UseRawType.java // FILE: C.java
import java.util.List; public class C<T> {
T val;
public class UseRawType { public C(T val) { this.val = val; }
static public List useList(List arg) {
return arg; public T getVal() { return val; }
}
} }
// FILE: use.kt // FILE: UseRaw.java
inline fun callRawType() = UseRawType.useList(listOf("OK")) as List<String> public class UseRaw {
static public C cId(C c) { return c; }
static public void cId() {} // DescriptorByIdSignatureFinder only checks ID if there are multiple functions with a given name.
}
// FILE: inlineCall.kt
inline fun inlineCallRaw(s: String): String =
(UseRaw.cId(C(s)) as C<String>).getVal()
// FILE: box.kt // FILE: box.kt
fun box() = callRawType()[0] fun box() = inlineCallRaw("OK")