KT-2752: refactor NameSuggestion, change rules for determining name stability and applying mangling

This commit is contained in:
Alexey Andreev
2016-09-21 16:17:49 +03:00
parent 6f7e7d8504
commit 9c7c82b151
21 changed files with 190 additions and 273 deletions
@@ -0,0 +1,54 @@
// MODULE: lib1
// FILE: lib1.kt
package lib1
interface A {
private fun foo() = "A.foo"
fun bar() = foo()
}
// MODULE: lib2
// FILE: lib2.kt
package lib2
interface B {
private fun foo() = "B.foo"
fun bar() = foo()
}
// MODULE: main(lib1,lib2)
// FILE: main.kt
package main
import lib1.A
import lib2.B
class Derived1 : A, B {
override fun bar() = super<A>.bar()
}
class Derived2 : A, B {
override fun bar() = super<B>.bar()
}
// NOTE. This test is fragile, it may fail due to unexpected (and correct) changes in algorithm that assigns
// unique identifiers to non-public declarations. However, we don't see any way of doing such test so that
// it won't report false positives eventually. So be patient and just update this test whenever you changed
// algorithm of assigning unique identifiers.
// Please, check that A.foo and B.foo have different JS names.
private fun checkJsNames(o: dynamic): Boolean = "foo_2pru9n\$_0" in o && "foo_2psha1\$_0" in o
fun box(): String {
val a = Derived1()
if (a.bar() != "A.foo") return "fail1: ${a.bar()}"
val b = Derived2()
if (b.bar() != "B.foo") return "fail2: ${b.bar()}"
if (!checkJsNames(a)) return "fail3"
if (!checkJsNames(b)) return "fail4"
return "OK"
}
@@ -0,0 +1,53 @@
// MODULE: lib
// FILE: lib.kt
package lib
open class A {
private val x = 23
fun foo() = x
}
// MODULE: lib-old
// FILE: lib.kt
package lib
open class A {
fun foo() = 12
}
inline fun check() = true
// MODULE: main(lib-old)
// FILE: main.kt
package main
import lib.A
import lib.check
class B : A() {
private var x = 42
fun bar() = x
}
// NOTE. This test is fragile, it may fail due to unexpected (and correct) changes in algorithm that assigns
// unique identifiers to non-public declarations. However, we don't see any way of doing such test so that
// it won't report false positives eventually. So be patient and just update this test whenever you changed
// algorithm of assigning unique identifiers.
// Please, check that A.x and B.x have different JS names.
private fun checkJsNames(o: dynamic): Boolean = "x_i8qwny\$_0" in o && "x_0" in o
fun box(): String {
if (!check()) return "check failed: did not compile against old library"
val a = A()
if (a.foo() != 23) return "fail1: ${a.foo()}"
val b = B()
if (b.foo() != 23) return "fail2: ${b.foo()}"
if (b.bar() != 42) return "fail3: ${b.bar()}"
if (!checkJsNames(b)) return "fail4"
return "OK"
}