azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[KLIB tool] Minor. Rename ir() to dumpIr()

Browse Source
This commit is contained in:
Dmitriy Dolovov
2023-10-05 14:13:41 +02:00
committed by Space Team
parent 02f52371c1
commit a49723e35c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt
+2 -2
View File
@@ -270,7 +270,7 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?) {
} }
@OptIn(ObsoleteDescriptorBasedAPI::class) @OptIn(ObsoleteDescriptorBasedAPI::class)
fun ir(output: Appendable, printSignatures: Boolean) { fun dumpIr(output: Appendable, printSignatures: Boolean) {
val module = loadModule() val module = loadModule()
val library = module.kotlinLibrary val library = module.kotlinLibrary
checkLibraryHasIr(library) checkLibraryHasIr(library)
@@ -384,7 +384,7 @@ fun main(args: Array<String>) {
val library = Library(command.library, repository) val library = Library(command.library, repository)
when (command.verb) { 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-ir-signatures" -> library.dumpIrSignatures(System.out, signatureVersion)
"dump-metadata" -> library.dumpMetadata(System.out, printSignatures) "dump-metadata" -> library.dumpMetadata(System.out, printSignatures)
"contents" -> library.contents(System.out, printSignatures) "contents" -> library.contents(System.out, printSignatures)
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt
+2 -2
View File
@@ -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.PipelineType
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts 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.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.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile
import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tag
import java.io.File import java.io.File
@@ -53,7 +53,7 @@ abstract class AbstractNativeKlibDumpIrTest : AbstractNativeSimpleTest() {
) { ) {
val artifact = compilationResult.assertSuccess().resultingArtifact val artifact = compilationResult.assertSuccess().resultingArtifact
val kotlinNativeClassLoader = testRunSettings.get<KotlinNativeClassLoader>() val kotlinNativeClassLoader = testRunSettings.get<KotlinNativeClassLoader>()
val klibIr = artifact.getIr(kotlinNativeClassLoader.classLoader, printSignatures) val klibIr = artifact.dumpIr(kotlinNativeClassLoader.classLoader, printSignatures)
assertEqualsToFile(expectedContents, klibIr) assertEqualsToFile(expectedContents, klibIr)
} }
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt
+2 -2
View File
@@ -24,9 +24,9 @@ internal fun TestCompilationArtifact.KLIB.dumpMetadata(kotlinNativeClassLoader:
return invokeKlibTool(kotlinNativeClassLoader, klibFile, "dumpMetadata", /* printSignatures= */ false) return invokeKlibTool(kotlinNativeClassLoader, klibFile, "dumpMetadata", /* printSignatures= */ false)
} }
internal fun TestCompilationArtifact.KLIB.getIr( internal fun TestCompilationArtifact.KLIB.dumpIr(
kotlinNativeClassLoader: ClassLoader, kotlinNativeClassLoader: ClassLoader,
printSignatures: Boolean = false, printSignatures: Boolean = false,
): String { ): String {
return invokeKlibTool(kotlinNativeClassLoader, klibFile, "ir", printSignatures) return invokeKlibTool(kotlinNativeClassLoader, klibFile, "dumpIr", printSignatures)
} }