From e2dafdb5b917080386202f6e21f10705c595a0db Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Thu, 11 May 2023 12:05:46 +0200 Subject: [PATCH] [Native/Tests] Add explicit import for SharedImmutable This fixes an overload resolution ambiguity in K2. #KT-56272 --- kotlin-native/backend.native/tests/build.gradle | 3 +-- .../tests/runtime/concurrent/worker_bound_reference0.kt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index dc1cc76cda2..56fe0ed92bf 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -884,8 +884,7 @@ standaloneTest("cleaner_in_tls_worker") { } standaloneTest("worker_bound_reference0") { - enabled = (project.testTarget != 'wasm32') && // Workers need pthreads. - !isK2(project) // KT-56272 + enabled = (project.testTarget != 'wasm32') // Workers need pthreads. source = "runtime/concurrent/worker_bound_reference0.kt" flags = ['-tr'] diff --git a/kotlin-native/backend.native/tests/runtime/concurrent/worker_bound_reference0.kt b/kotlin-native/backend.native/tests/runtime/concurrent/worker_bound_reference0.kt index 6544f686c5d..85e67a24346 100644 --- a/kotlin-native/backend.native/tests/runtime/concurrent/worker_bound_reference0.kt +++ b/kotlin-native/backend.native/tests/runtime/concurrent/worker_bound_reference0.kt @@ -9,6 +9,7 @@ package runtime.concurrent.worker_bound_reference0 import kotlin.test.* import kotlin.native.concurrent.* +import kotlin.native.concurrent.SharedImmutable import kotlin.native.* import kotlin.native.ref.WeakReference import kotlin.native.runtime.GC