commit e2a18df70aee538a5e4d86a6edc293f16cc75ff3
author Vladimir Sukharev <vladimir.sukharev@jetbrains.com> Tue Aug 30 11:32:15 2022 +0200
committer Vladimir Sukharev <vladimir.sukharev@jetbrains.com> Tue Aug 30 11:32:15 2022 +0200
tree e1ea6e283d059a9a58101106e21c65916b4d6daa
parent 5defce91e13f4f81e4f66117eb3327ee0b7ad301

Address review comments

kotlin-native/backend.native/tests/build.gradle

diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index cdcb384..8dcddd6 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -6212,10 +6212,11 @@
         phaseToCheck = "BitcodeOptimization"
     }
 
-    fileCheckTest("filecheck_redundant_safepoints_removal_arm") {
+    fileCheckTest("filecheck_redundant_safepoints_removal_smallbinary") {
         enabled = isExperimentalMM && project.globalTestArgs.contains("-opt") && needSmallBinary(project)
         annotatedSource = project.file('filecheck/redundant_safepoints.kt')
-        checkPrefix = "CHECK-ARM"
+        targetName = "watchos_arm32"
+        checkPrefix = "CHECK-SMALLBINARY"
         extraOpts = ["-Xbinary=memoryModel=experimental", "-opt"]
         phaseToCheck = "RemoveRedundantSafepoints"
     }

kotlin-native/backend.native/tests/filecheck/redundant_safepoints.kt

diff --git a/kotlin-native/backend.native/tests/filecheck/redundant_safepoints.kt b/kotlin-native/backend.native/tests/filecheck/redundant_safepoints.kt
index 427be5a..6c7b546 100644
--- a/kotlin-native/backend.native/tests/filecheck/redundant_safepoints.kt
+++ b/kotlin-native/backend.native/tests/filecheck/redundant_safepoints.kt
@@ -16,16 +16,16 @@
 @Retain
 fun h(cond: Boolean): Any {
     // CHECK: _ZN6kotlin2mm8internal20gSuspensionRequestedE
-    // CHECK-ARM: {{call .*Kotlin_mm_safePointFunctionPrologue}}
+    // CHECK-SMALLBINARY: {{call .*Kotlin_mm_safePointFunctionPrologue}}
     // CHECK-NOT: _ZN6kotlin2mm8internal20gSuspensionRequestedE
     // CHECK-NOT: {{call .*Kotlin_mm_safePointFunctionPrologue}}
     // CHECK: br
-    // CHECK-ARM: br
+    // CHECK-SMALLBINARY: br
     if (cond) {
         // CHECK-NOT: _ZN6kotlin2mm8internal20gSuspensionRequestedE
         // CHECK-NOT: {{call .*Kotlin_mm_safePointFunctionPrologue}}
         // CHECK: br
-        // CHECK-ARM: br
+        // CHECK-SMALLBINARY: br
         return listOf(C(), C())
     } else {
         // CHECK-NOT: _ZN6kotlin2mm8internal20gSuspensionRequestedE
@@ -39,7 +39,7 @@
 @Retain
 fun main() {
     // CHECK: _ZN6kotlin2mm8internal20gSuspensionRequestedE
-    // CHECK-ARM: {{call .*Kotlin_mm_safePointFunctionPrologue}}
+    // CHECK-SMALLBINARY: {{call .*Kotlin_mm_safePointFunctionPrologue}}
     // CHECK-NOT: _ZN6kotlin2mm8internal20gSuspensionRequestedE
     // CHECK-NOT: {{call .*Kotlin_mm_safePointFunctionPrologue}}
     println(g())