diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt index cafa2ab0320..113d26f35d1 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt @@ -270,7 +270,7 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?) { } @OptIn(ObsoleteDescriptorBasedAPI::class) - fun ir(output: Appendable, printSignatures: Boolean) { + fun dumpIr(output: Appendable, printSignatures: Boolean) { val module = loadModule() val library = module.kotlinLibrary checkLibraryHasIr(library) @@ -384,7 +384,7 @@ fun main(args: Array) { val library = Library(command.library, repository) when (command.verb) { - "dump-ir" -> library.ir(System.out, printSignatures) + "dump-ir" -> library.dumpIr(System.out, printSignatures) "dump-ir-signatures" -> library.dumpIrSignatures(System.out, signatureVersion) "dump-metadata" -> library.dumpMetadata(System.out, printSignatures) "contents" -> library.contents(System.out, printSignatures) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt index a69361a4b6a..3a116fa92ea 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeCla import org.jetbrains.kotlin.konan.test.blackbox.support.settings.PipelineType import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile -import org.jetbrains.kotlin.konan.test.blackbox.support.util.getIr +import org.jetbrains.kotlin.konan.test.blackbox.support.util.dumpIr import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile import org.junit.jupiter.api.Tag import java.io.File @@ -53,7 +53,7 @@ abstract class AbstractNativeKlibDumpIrTest : AbstractNativeSimpleTest() { ) { val artifact = compilationResult.assertSuccess().resultingArtifact val kotlinNativeClassLoader = testRunSettings.get() - val klibIr = artifact.getIr(kotlinNativeClassLoader.classLoader, printSignatures) + val klibIr = artifact.dumpIr(kotlinNativeClassLoader.classLoader, printSignatures) assertEqualsToFile(expectedContents, klibIr) } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt index 61807cf8647..29a08e75a71 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt @@ -24,9 +24,9 @@ internal fun TestCompilationArtifact.KLIB.dumpMetadata(kotlinNativeClassLoader: return invokeKlibTool(kotlinNativeClassLoader, klibFile, "dumpMetadata", /* printSignatures= */ false) } -internal fun TestCompilationArtifact.KLIB.getIr( +internal fun TestCompilationArtifact.KLIB.dumpIr( kotlinNativeClassLoader: ClassLoader, printSignatures: Boolean = false, ): String { - return invokeKlibTool(kotlinNativeClassLoader, klibFile, "ir", printSignatures) + return invokeKlibTool(kotlinNativeClassLoader, klibFile, "dumpIr", printSignatures) }