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

JVM IR: support raw types in typeOf

Browse Source
This commit is contained in:
Alexander Udalov
2021-06-30 22:23:17 +02:00
parent 012c7c39af
commit ae07127f08
9 changed files with 338 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/reflection/typeOf/noReflect/rawTypes_after.kt
Vendored
+57
View File
@@ -0,0 +1,57 @@
// !API_VERSION: LATEST
// !USE_EXPERIMENTAL: kotlin.ExperimentalStdlibApi
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME
// FILE: box.kt
package test
import kotlin.reflect.KType
import kotlin.reflect.typeOf
import kotlin.test.assertEquals
fun check(expected: String, actual: KType) {
assertEquals(expected + " (Kotlin reflection is not available)", actual.toString())
}
class C<T, U : Number>
fun box(): String {
check("test.C<java.lang.Object?, java.lang.Number>", returnTypeOf { J.raw() })
check("test.C<java.lang.Object?, java.lang.Number>", returnTypeOf { J.rawNotNull() })
check("java.util.List<java.lang.Object?>", returnTypeOf { J.rawList() })
check("java.util.Map<java.lang.Object?, java.lang.Object?>", returnTypeOf { J.rawNotNullMap() })
return "OK"
}
inline fun <reified T : Any> returnTypeOf(block: () -> T) =
typeOf<T>()
// FILE: J.java
import test.C;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
public class J {
public static C raw() {
return null;
}
@NotNull
public static C rawNotNull() {
return null;
}
public static List rawList() {
return null;
}
@NotNull
public static Map rawNotNullMap() {
return null;
}
}
compiler/testData/codegen/box/reflection/typeOf/noReflect/rawTypes_before.kt
Vendored
+57
View File
@@ -0,0 +1,57 @@
// !API_VERSION: 1.5
// !USE_EXPERIMENTAL: kotlin.ExperimentalStdlibApi
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME
// FILE: box.kt
package test
import kotlin.reflect.KType
import kotlin.reflect.typeOf
import kotlin.test.assertEquals
fun check(expected: String, actual: KType) {
assertEquals(expected + " (Kotlin reflection is not available)", actual.toString())
}
class C<T, U : Number>
fun box(): String {
check("test.C<java.lang.Object?, java.lang.Number>", returnTypeOf { J.raw() })
check("test.C<java.lang.Object?, java.lang.Number>", returnTypeOf { J.rawNotNull() })
check("java.util.List<java.lang.Object?>", returnTypeOf { J.rawList() })
check("java.util.Map<java.lang.Object?, java.lang.Object?>", returnTypeOf { J.rawNotNullMap() })
return "OK"
}
inline fun <reified T : Any> returnTypeOf(block: () -> T) =
typeOf<T>()
// FILE: J.java
import test.C;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
public class J {
public static C raw() {
return null;
}
@NotNull
public static C rawNotNull() {
return null;
}
public static List rawList() {
return null;
}
@NotNull
public static Map rawNotNullMap() {
return null;
}
}
compiler/testData/codegen/box/reflection/typeOf/rawTypes_after.kt
Vendored
+59
View File
@@ -0,0 +1,59 @@
// !API_VERSION: LATEST
// !USE_EXPERIMENTAL: kotlin.ExperimentalStdlibApi
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_REFLECT
// FILE: box.kt
package test
import kotlin.reflect.KType
import kotlin.reflect.typeOf
class C<T, U : Number>
fun box(): String {
val v1 = returnTypeOf { J.raw() }.toString()
if (v1 != "(test.C<kotlin.Any?, kotlin.Number>..test.C<*, *>?)") return "Fail 1: $v1"
val v2 = returnTypeOf { J.rawNotNull() }.toString()
if (v2 != "(test.C<kotlin.Any?, kotlin.Number>..test.C<*, *>)") return "Fail 2: $v2"
val v3 = returnTypeOf { J.rawList() }.toString()
if (v3 != "(kotlin.collections.MutableList<kotlin.Any?>..kotlin.collections.List<*>?)") return "Fail 3: $v3"
val v4 = returnTypeOf { J.rawNotNullMap() }.toString()
if (v4 != "(kotlin.collections.MutableMap<kotlin.Any?, kotlin.Any?>..kotlin.collections.Map<*, *>)") return "Fail 4: $v4"
return "OK"
}
inline fun <reified T : Any> returnTypeOf(block: () -> T) =
typeOf<T>()
// FILE: J.java
import test.C;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
public class J {
public static C raw() {
return null;
}
@NotNull
public static C rawNotNull() {
return null;
}
public static List rawList() {
return null;
}
@NotNull
public static Map rawNotNullMap() {
return null;
}
}
compiler/testData/codegen/box/reflection/typeOf/rawTypes_before.kt
Vendored
+59
View File
@@ -0,0 +1,59 @@
// !API_VERSION: 1.5
// !USE_EXPERIMENTAL: kotlin.ExperimentalStdlibApi
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_REFLECT
// FILE: box.kt
package test
import kotlin.reflect.KType
import kotlin.reflect.typeOf
class C<T, U : Number>
fun box(): String {
val v1 = returnTypeOf { J.raw() }.toString()
if (v1 != "test.C<kotlin.Any?, kotlin.Number>") return "Fail 1: $v1"
val v2 = returnTypeOf { J.rawNotNull() }.toString()
if (v2 != "test.C<kotlin.Any?, kotlin.Number>") return "Fail 2: $v2"
val v3 = returnTypeOf { J.rawList() }.toString()
if (v3 != "kotlin.collections.List<kotlin.Any?>") return "Fail 3: $v3"
val v4 = returnTypeOf { J.rawNotNullMap() }.toString()
if (v4 != "kotlin.collections.Map<kotlin.Any?, kotlin.Any?>") return "Fail 4: $v4"
return "OK"
}
inline fun <reified T : Any> returnTypeOf(block: () -> T) =
typeOf<T>()
// FILE: J.java
import test.C;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
public class J {
public static C raw() {
return null;
}
@NotNull
public static C rawNotNull() {
return null;
}
public static List rawList() {
return null;
}
@NotNull
public static Map rawNotNullMap() {
return null;
}
}