Factor out duplicated mangling logic for functions into the base class

^KT-57777 Fixed
^KT-57818 Fixed
This commit is contained in:
Sergej Jaskiewicz
2023-04-13 11:35:30 +02:00
committed by Space Team
parent 8ae196d4fc
commit 02180e8685
77 changed files with 366 additions and 424 deletions
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
val p = 0
fun foo() = 1
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
var p = 0
fun testVariable() {
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
class A
operator fun A.plusAssign(s: String) {}
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
class A {
fun foo() {}
val bar = 0
@@ -1,4 +1,4 @@
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
// ^ KT-57429
open class L<LL>(val ll: LL)
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
class A<T> {
fun foo() {}
val bar = 42
@@ -1,6 +1,6 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
// ^ KT-57433
package test
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
import Host.objectMember
object Host {
@@ -1,8 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
fun <T> castFun(x: Any) = x as T
fun <T> Any.castExtFun() = this as T
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
class A
val test = A()
-4
View File
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
val p: Any? = null
fun foo(): Any? = null
@@ -2,7 +2,7 @@
// IGNORE_BACKEND: JS_IR_ES6
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57777, KT-57427, KT-57430
// ^ KT-57427, KT-57430
enum class X {
@@ -1,9 +1,6 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57777
enum class A { V1 }
fun testVariableAssignment_throws(a: A) {
@@ -1,8 +1,4 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
val String.okext: String get() = "OK"
fun String.test5() = okext
-4
View File
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
var testSimple: Int = 0
set(value) {
field = value
@@ -1,9 +1,5 @@
// WITH_STDLIB
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
fun interface Fn<T, R> {
fun run(s: String, i: Int, t: T): R
}
@@ -1,8 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
val <T> T.id get() = this
val test = "abc".id
@@ -1,5 +1,5 @@
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57436, KT-57429
// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
// ^ KT-57429
class Value<T>(var value: T = null as T, var text: String? = null)
@@ -1,6 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
inline fun <reified T : Any> Any.test1(): T? =
if (this is T) this else null
-4
View File
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
val test1 = "\uD83E\uDD17"
val test2 = "\uD83E\uDD17\uD83E\uDD17"
+1 -1
View File
@@ -1,4 +1,4 @@
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
// ^ KT-57429
class A<T>(private val value: T) {
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
import A.foo
import A.bar
import A.fooExt
@@ -1,9 +1,6 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57777
object A
enum class En { X }
-4
View File
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
val ok = "OK"
val ok2 = ok
val ok3: String get() = "OK"
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
class A {
fun foo() {}
}
@@ -1,4 +1,4 @@
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
// ^ KT-57433
package test
@@ -1,9 +1,6 @@
// WITH_STDLIB
// !LANGUAGE: +ImplicitSignedToUnsignedIntegerConversion
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
// FILE: signedToUnsignedConversions_annotation.kt
package kotlin.internal
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
fun foo(): String = ""
val x = 42
@@ -1,9 +1,6 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57777
val n: Any? = null
enum class En(val x: String?) {
@@ -1,7 +1,3 @@
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
import Host.Nested
class C(x: Int)
@@ -1,8 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
inline fun <reified T : Any> classRefFun() = T::class
inline fun <reified T : Any> Any.classRefExtFun() = T::class
@@ -1,9 +1,6 @@
// FIR_IDENTICAL
// WITH_STDLIB
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
val testSimpleUIntLiteral = 1u
val testSimpleUIntLiteralWithOverflow = 0xFFFF_FFFFu
-3
View File
@@ -1,9 +1,6 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57777
enum class Enum { A }
object A
val a = 0
-4
View File
@@ -1,9 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
// ^ KT-57818
val test1 = arrayOf<String>()
val test2 = arrayOf("1", "2", "3")
val test3 = arrayOf("0", *test2, *test1, "4")
@@ -1,8 +1,5 @@
// FIR_IDENTICAL
// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
// ^ KT-57818
val <T : CharSequence> T.gk: () -> T
get() = { -> this }
@@ -1,9 +1,6 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// MUTE_SIGNATURE_COMPARISON_K2: ANY
// ^ KT-57777
enum class En { A, B, C }
fun test() {