Make Kotlin_initRuntimeIfNeeded switch to native state

This commit is contained in:
Alexander Shabalin
2021-05-20 13:48:49 +00:00
committed by Space
parent f40110eb83
commit eac3f507b6
16 changed files with 61 additions and 7 deletions
@@ -4899,6 +4899,7 @@ if (isAppleTarget(project)) {
}
frameworkTest('testValuesGenericsFramework') {
enabled = !isExperimentalMM // Experimental MM does not support thread state switching for ObjC interop yet.
framework('ValuesGenerics') {
sources = ['objcexport/values.kt', 'framework/values_generics']
}
@@ -4906,6 +4907,7 @@ if (isAppleTarget(project)) {
}
frameworkTest("testStdlibFramework") {
enabled = !isExperimentalMM // Experimental MM does not support thread state switching for ObjC interop yet.
framework('Stdlib') {
sources = ['framework/stdlib']
bitcode = true
@@ -4917,6 +4919,7 @@ if (isAppleTarget(project)) {
if (cacheTesting != null && cacheTesting.isDynamic) {
// testMultipleFrameworks disabled until https://youtrack.jetbrains.com/issue/KT-34262 is fixed.
} else frameworkTest("testMultipleFrameworks") {
enabled = !isExperimentalMM // Experimental MM does not support thread state switching for ObjC interop yet.
framework('First') {
sources = ['framework/multiple/framework1', 'framework/multiple/shared']
bitcode = true
@@ -4929,6 +4932,7 @@ if (isAppleTarget(project)) {
}
frameworkTest("testMultipleFrameworksStatic") {
enabled = !isExperimentalMM // Experimental MM does not support thread state switching for ObjC interop yet.
if (cacheTesting != null) {
// See https://youtrack.jetbrains.com/issue/KT-34261.
expectedExitStatus = 134
@@ -4962,7 +4966,8 @@ if (isAppleTarget(project)) {
}
frameworkTest("testKt42397Framework") {
enabled = !project.globalTestArgs.contains('-opt')
enabled = !project.globalTestArgs.contains('-opt') &&
!isExperimentalMM // Experimental MM does not support thread state switching for ObjC interop yet.
framework("Kt42397") {
sources = ['framework/kt42397']
}
@@ -4970,6 +4975,7 @@ if (isAppleTarget(project)) {
}
frameworkTest("testKt43517Framework") {
enabled = !isExperimentalMM // Experimental MM does not support thread state switching for ObjC interop yet.
framework('Kt43517') {
sources = ['framework/kt43517']
library = 'objcKt43517'
@@ -7,6 +7,7 @@ import kotlinx.cinterop.*
val global = AtomicInt(0)
fun ensureInititalized() {
// Only needed with the legacy MM. TODO: Remove when legacy MM is gone.
kotlin.native.initRuntimeIfNeeded()
// Leak memory
StableRef.create(Any())
@@ -7,6 +7,7 @@ import kotlinx.cinterop.*
val global = AtomicInt(0)
fun ensureInititalized() {
// Only needed with the legacy MM. TODO: Remove when legacy MM is gone.
kotlin.native.initRuntimeIfNeeded()
// Leak memory
StableRef.create(Any())