From c6d9821ef0746bbbd4c93b7e9c4a2b2468824ce9 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Tue, 9 May 2023 16:52:04 +0000 Subject: [PATCH] [K2/N] Rework testStdlibFramework to avoid compiler crash due to KT-58459 ^KT-58459 Merge-request: KT-MR-10043 Merged-by: Vladimir Sukharev --- kotlin-native/backend.native/tests/build.gradle | 1 - kotlin-native/backend.native/tests/framework/stdlib/stdlib.kt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 1d04b3521e1..a866ae98a80 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -5867,7 +5867,6 @@ if (isAppleTarget(project)) { swiftSources = ['framework/values_generics/'] } - if(!isK2(project)) // KT-56271 frameworkTest("testStdlibFramework") { framework('Stdlib') { sources = ['framework/stdlib'] diff --git a/kotlin-native/backend.native/tests/framework/stdlib/stdlib.kt b/kotlin-native/backend.native/tests/framework/stdlib/stdlib.kt index 24d6538bffa..38d39c86941 100644 --- a/kotlin-native/backend.native/tests/framework/stdlib/stdlib.kt +++ b/kotlin-native/backend.native/tests/framework/stdlib/stdlib.kt @@ -72,7 +72,6 @@ fun gc() = kotlin.native.runtime.GC.collect() @Throws(Throwable::class) @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") fun testSet(set: Set) { - set as kotlin.native.internal.KonanSet // Smart cast to access getElement below. val setAny: Set = set assertTrue(set.contains("a")) @@ -80,7 +79,7 @@ fun testSet(set: Set) { assertFalse(set.contains("h")) assertFalse(setAny.contains(1)) - + set as kotlin.native.internal.KonanSet // Smart cast to access getElement below. assertEquals("a", set.getElement("a")) assertNull(set.getElement("aa")) assertNull((setAny as kotlin.native.internal.KonanSet).getElement(1))