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

jvm-abi-gen: Update metadata version if needed

Browse Source
This commit is contained in:
Steven Schäfer
2021-03-31 18:30:37 +02:00
committed by Alexander Udalov
parent 1b5214a2dc
commit 4a59af3b8b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiMetadataProcessor.kt
+7 -3
View File
@@ -20,21 +20,25 @@ import org.jetbrains.org.objectweb.asm.Opcodes
*/ */
fun abiMetadataProcessor(internalName: String, publicClasses: Set<String>, annotationVisitor: AnnotationVisitor): AnnotationVisitor = fun abiMetadataProcessor(internalName: String, publicClasses: Set<String>, annotationVisitor: AnnotationVisitor): AnnotationVisitor =
kotlinClassHeaderVisitor { header -> kotlinClassHeaderVisitor { header ->
// kotlinx-metadata only supports writing Kotlin metadata of version >= 1.4, so we need to
// update the metadata version if we encounter older metadata annotations.
val metadataVersion =
if (header.metadataVersion.let { it.size >= 2 && it[0] >= 1 && it[1] >= 4 }) header.metadataVersion else intArrayOf(1, 4)
val newHeader = when (val metadata = KotlinClassMetadata.read(header)) { val newHeader = when (val metadata = KotlinClassMetadata.read(header)) {
is KotlinClassMetadata.Class -> { is KotlinClassMetadata.Class -> {
val writer = KotlinClassMetadata.Class.Writer() val writer = KotlinClassMetadata.Class.Writer()
metadata.accept(AbiKmClassVisitor(internalName, publicClasses, writer)) metadata.accept(AbiKmClassVisitor(internalName, publicClasses, writer))
writer.write(header.metadataVersion, header.extraInt).header writer.write(metadataVersion, header.extraInt).header
} }
is KotlinClassMetadata.FileFacade -> { is KotlinClassMetadata.FileFacade -> {
val writer = KotlinClassMetadata.FileFacade.Writer() val writer = KotlinClassMetadata.FileFacade.Writer()
metadata.accept(AbiKmPackageVisitor(writer)) metadata.accept(AbiKmPackageVisitor(writer))
writer.write(header.metadataVersion, header.extraInt).header writer.write(metadataVersion, header.extraInt).header
} }
is KotlinClassMetadata.MultiFileClassPart -> { is KotlinClassMetadata.MultiFileClassPart -> {
val writer = KotlinClassMetadata.MultiFileClassPart.Writer() val writer = KotlinClassMetadata.MultiFileClassPart.Writer()
metadata.accept(AbiKmPackageVisitor(writer)) metadata.accept(AbiKmPackageVisitor(writer))
writer.write(metadata.facadeClassName, header.metadataVersion, header.extraInt).header writer.write(metadata.facadeClassName, metadataVersion, header.extraInt).header
} }
else -> header else -> header
} }