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

Bump d8 used in box tests to 2.1.75

Browse Source
This commit is contained in:
Dmitry Petrov
2021-03-10 11:34:10 +03:00
committed by TeamCityServer
parent 737fbe271f
commit 0cca07fa19
7 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/reflection/genericSignature/samWrappedLambdaVsReference.kt
Vendored
+2
View File
@@ -2,6 +2,8 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FULL_JDK
// IGNORE_DEXING
// ^ https://issuetracker.google.com/issues/182339153
// FILE: Java.java
compiler/testData/codegen/box/sam/equality/functionReferencesUnbound.kt
Vendored
+12 -10
View File
@@ -1,8 +1,10 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND: ANDROID
// ^ D8 merges method references with empty closure created by 'invokedynamic'
// FILE: test.kt
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
fun checkNotEqual(marker: String, x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$marker: $x and $y should NOT be equal")
}
private fun id(f: Runnable): Any = f
@@ -15,15 +17,15 @@ fun adapted2(vararg s: String): String = s[0]
fun box(): String {
// Since 1.0, SAM wrappers for Java do not implement equals/hashCode
checkNotEqual(id(::target1), id(::target1))
checkNotEqual(id(::target1), target1FromOtherFile())
checkNotEqual(id(::target1), id(::target2))
checkNotEqual("id(::target1), id(::target1)", id(::target1), id(::target1))
checkNotEqual("id(::target1), target1FromOtherFile()", id(::target1), target1FromOtherFile())
checkNotEqual("id(::target1), id(::target2)", id(::target1), id(::target2))
checkNotEqual(id(::adapted1), id(::adapted1))
checkNotEqual(id(::adapted1), adapted1FromOtherFile())
checkNotEqual(id(::adapted2), id(::adapted2))
checkNotEqual(id(::adapted2), adapted2FromOtherFile())
checkNotEqual(id(::adapted1), id(::adapted2))
checkNotEqual("id(::adapted1), id(::adapted1)", id(::adapted1), id(::adapted1))
checkNotEqual("id(::adapted1), adapted1FromOtherFile()", id(::adapted1), adapted1FromOtherFile())
checkNotEqual("id(::adapted2), id(::adapted2)", id(::adapted2), id(::adapted2))
checkNotEqual("id(::adapted2), adapted2FromOtherFile()", id(::adapted2), adapted2FromOtherFile())
checkNotEqual("id(::adapted1), id(::adapted2)", id(::adapted1), id(::adapted2))
return "OK"
}
compiler/testData/codegen/box/sam/equality/localFunctionReferences.kt
Vendored
+9 -7
View File
@@ -1,7 +1,9 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND: ANDROID
// ^ D8 merges method references with empty closure created by 'invokedynamic'
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
fun checkNotEqual(marker: String, x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$marker: $x and $y should NOT be equal")
}
private fun id(f: Runnable): Any = f
@@ -12,17 +14,17 @@ fun box(): String {
fun local1() {}
fun local2() {}
checkNotEqual(id(::local1), id(::local1))
checkNotEqual(id(::local1), id(::local2))
checkNotEqual("id(::local1), id(::local1)", id(::local1), id(::local1))
checkNotEqual("id(::local1), id(::local2)", id(::local1), id(::local2))
fun String.localExt() {}
checkNotEqual(id("A"::localExt), id("A"::localExt))
checkNotEqual(id("A"::localExt), id("B"::localExt))
checkNotEqual("id(\"A\"::localExt), id(\"A\"::localExt)", id("A"::localExt), id("A"::localExt))
checkNotEqual("id(\"A\"::localExt), id(\"B\"::localExt)", id("A"::localExt), id("B"::localExt))
fun adapted(default: String? = "", vararg va: Int): Int = 0
checkNotEqual(id(::adapted), id(::adapted))
checkNotEqual("id(::adapted), id(::adapted)", id(::adapted), id(::adapted))
return "OK"
}
compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
Vendored
+2
View File
@@ -1,5 +1,7 @@
// FULL_JDK
// TARGET_BACKEND: JVM
// IGNORE_DEXING
// ^ 2.1.75 fails with AssertionError (2.0.88 doesn't). TODO: investigate in more detail.
// FILE: 1.kt
package test