From 2fdb605a0384270e56a346f2131084d3378dd9f1 Mon Sep 17 00:00:00 2001 From: Alexander Korepanov Date: Tue, 20 Jun 2023 20:43:10 +0200 Subject: [PATCH] [JS IR] Fix tests ^KT-59001 --- .../jsTestHelpers/jsWithStdlibTestHelpers.kt | 1 - .../debug/localVariables/forLoopMultiline.kt | 8 ++++---- libraries/stdlib/api/js/kotlin.collections.kt | 16 ++-------------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/compiler/testData/debug/jsTestHelpers/jsWithStdlibTestHelpers.kt b/compiler/testData/debug/jsTestHelpers/jsWithStdlibTestHelpers.kt index 1971eeebc04..28e8fec53b1 100644 --- a/compiler/testData/debug/jsTestHelpers/jsWithStdlibTestHelpers.kt +++ b/compiler/testData/debug/jsTestHelpers/jsWithStdlibTestHelpers.kt @@ -9,5 +9,4 @@ internal val stdlibFqNames = mapOf( Pair::class to "kotlin.Pair", Triple::class to "kotlin.Triple", HashMap::class to "kotlin.collections.HashMap", - AbstractMutableMap.SimpleEntry::class to "kotlin.collections.AbstractMutableMap.SimpleEntry" ) diff --git a/compiler/testData/debug/localVariables/forLoopMultiline.kt b/compiler/testData/debug/localVariables/forLoopMultiline.kt index 209cfe342cc..32eb76a5e77 100644 --- a/compiler/testData/debug/localVariables/forLoopMultiline.kt +++ b/compiler/testData/debug/localVariables/forLoopMultiline.kt @@ -36,7 +36,7 @@ fun box() { // test.kt:5 box: // test.kt:11 box: map=kotlin.collections.HashMap // test.kt:11 box: map=kotlin.collections.HashMap -// test.kt:14 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry -// test.kt:14 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry -// test.kt:11 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry -// test.kt:16 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry +// test.kt:14 box: map=kotlin.collections.HashMap, e=EntryRef +// test.kt:14 box: map=kotlin.collections.HashMap, e=EntryRef +// test.kt:11 box: map=kotlin.collections.HashMap, e=EntryRef +// test.kt:16 box: map=kotlin.collections.HashMap, e=EntryRef diff --git a/libraries/stdlib/api/js/kotlin.collections.kt b/libraries/stdlib/api/js/kotlin.collections.kt index ed9eda52010..76ee095e64b 100644 --- a/libraries/stdlib/api/js/kotlin.collections.kt +++ b/libraries/stdlib/api/js/kotlin.collections.kt @@ -10311,6 +10311,8 @@ public open class HashMap : kotlin.collections.AbstractMutableMap, k public open override fun put(key: K, value: V): V? + public open override fun putAll(from: kotlin.collections.Map): kotlin.Unit + public open override fun remove(key: K): V? } @@ -10384,20 +10386,6 @@ public open class LinkedHashMap : kotlin.collections.HashMap, kotlin public constructor LinkedHashMap(initialCapacity: kotlin.Int, loadFactor: kotlin.Float) public constructor LinkedHashMap(original: kotlin.collections.Map) - - public open override val size: kotlin.Int { get; } - - public open override fun clear(): kotlin.Unit - - public open override fun containsKey(key: K): kotlin.Boolean - - public open override fun containsValue(value: V): kotlin.Boolean - - public open override operator fun get(key: K): V? - - public open override fun put(key: K, value: V): V? - - public open override fun remove(key: K): V? } public open class LinkedHashSet : kotlin.collections.HashSet, kotlin.collections.MutableSet {