From 61ed34f4b77fbb1886e7fe9b686fc3c03f3c7baf Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Wed, 31 May 2023 18:29:17 +0200 Subject: [PATCH] K2: Adjust JDK 21 test data to the latest JvmMappedScope changes See 2e5b783cc6b0cce8c8fab9276ce78917c91c46b7 for details After the fix for KT-57694 (mostly rewritten JvmMappedScope), the behavior of loading new JDK 21 members of K2 has been aligned with K1 --- .../testsWithJdk21/newListMethods.fir.kt | 46 ------------------- .../testsWithJdk21/newListMethods.kt | 1 + 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt deleted file mode 100644 index ef595ad5612..00000000000 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt +++ /dev/null @@ -1,46 +0,0 @@ -// ISSUE: KT-58371 -// WITH_STDLIB - -class A : ArrayList() { - override fun addFirst(t: T) { - super.addFirst(t) - } - - override fun addLast(t: T) { - super.addLast(t) - } - - override fun getFirst(): T = super.getFirst() - override fun getLast(): T = super.getLast() - - override fun removeFirst(): T = super.removeFirst() - override fun removeLast(): T = super.removeLast() - - override fun reversed(): List = super.reversed() -} - -fun foo(x: MutableList, y: ArrayList, z: A) { - x.addFirst("") - x.addLast("") - x.getFirst() - x.getLast() - x.removeFirst() - x.removeLast() - x.reversed() - - y.addFirst("") - y.addLast("") - y.getFirst() - y.getLast() - y.removeFirst() - y.removeLast() - y.reversed() - - z.addFirst("") - z.addLast("") - z.getFirst() - z.getLast() - z.removeFirst() - z.removeLast() - z.reversed() -} diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt index 3c44aaf9b7b..8e1f5a302d8 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt +++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // ISSUE: KT-58371 // WITH_STDLIB