Skip to content

Commit

Permalink
Update kotlin-metadata to 2.0.0 (#441)
Browse files Browse the repository at this point in the history 
Fixes #439
  • Loading branch information
@mvicsokolova
mvicsokolova authored Jun 24, 2024
1 parent 2ff433e commit fbdf1c7
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 154 deletions.
2 changes: 1 addition & 1 deletion atomicfu-transformer/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
api(libs.bundles.asm)
api(libs.slf4j.api)
api(libs.mozilla.rhino)
api(libs.kotlinx.metadataJvm)
api(libs.kotlin.metadataJvm)

compileOnly(libs.kotlin.stdlib)

Expand Down
195 changes: 44 additions & 151 deletions atomicfu-transformer/src/main/kotlin/kotlinx/atomicfu/transformer/MetadataTransformer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

package kotlinx.atomicfu.transformer

import kotlinx.metadata.*
import kotlinx.metadata.jvm.*
import kotlin.metadata.*
import kotlin.metadata.jvm.*
import org.objectweb.asm.tree.*

const val KOTLIN_METADATA_DESC = "Lkotlin/Metadata;"
Expand All @@ -18,7 +18,6 @@ class MetadataTransformer(
removeFields.map { JvmFieldSignature(it.name, it.desc) }
private val removeMethodSignatures: List<JvmMethodSignature> =
removeMethods.map { JvmMethodSignature(it.name, it.desc) }
private var transformed = false

@Suppress("UNCHECKED_CAST")
fun transformMetadata(metadataAnnotation: AnnotationNode): Boolean {
Expand All @@ -32,186 +31,80 @@ class MetadataTransformer(
packageName = map["pn"] as String?,
extraInt = map["xi"] as Int?
)
val transformedMetadata = when (val kotlinClassMetadata = KotlinClassMetadata.read(metadata)) {
val metadataVersion =
JvmMetadataVersion(metadata.metadataVersion[0], metadata.metadataVersion[1], metadata.metadataVersion[2])
val transformedMetadata = when (val kotlinClassMetadata = KotlinClassMetadata.readStrict(metadata)) {
is KotlinClassMetadata.Class -> {
val w = KotlinClassMetadata.Class.Writer()
kotlinClassMetadata.accept(ClassFilter(w))
val transformedKotlinClassMetadata = w.write(metadata.metadataVersion, metadata.extraInt)
KotlinClassMetadata.writeClass(transformedKotlinClassMetadata.kmClass)
val kmClass = kotlinClassMetadata.kmClass
KotlinClassMetadata.Class(kmClass.transformKmClass(), metadataVersion, metadata.extraInt).write()
}

is KotlinClassMetadata.FileFacade -> {
val w = KotlinClassMetadata.FileFacade.Writer()
kotlinClassMetadata.accept(PackageFilter(w))
val transformedKotlinClassMetadata = w.write(metadata.metadataVersion, metadata.extraInt)
KotlinClassMetadata.writeFileFacade(transformedKotlinClassMetadata.kmPackage)
val kmPackage = kotlinClassMetadata.kmPackage
KotlinClassMetadata.FileFacade(
kmPackage.removeAtomicfuDeclarations() as KmPackage,
metadataVersion,
metadata.extraInt
).write()
}

is KotlinClassMetadata.MultiFileClassPart -> {
val w = KotlinClassMetadata.MultiFileClassPart.Writer()
kotlinClassMetadata.accept(PackageFilter(w))
val transformedKotlinClassMetadata = w.write(kotlinClassMetadata.facadeClassName, metadata.metadataVersion, metadata.extraInt)
KotlinClassMetadata.writeMultiFileClassPart(transformedKotlinClassMetadata.kmPackage, transformedKotlinClassMetadata.facadeClassName)
val kmPackage = kotlinClassMetadata.kmPackage
KotlinClassMetadata.MultiFileClassPart(
kmPackage.removeAtomicfuDeclarations() as KmPackage,
metadata.extraString,
metadataVersion,
metadata.extraInt
).write()
}

else -> return false // not transformed
}
if (!transformed) return false
with (metadataAnnotation) {
// read resulting header & update annotation data
with(metadataAnnotation) {
// read the resulting header & update annotation data
setKey("d1", transformedMetadata.data1.toList())
setKey("d2", transformedMetadata.data2.toList())
}
return true // transformed
}

private inner class ClassFilter(v: KmClassVisitor?) : KmClassVisitor(v) {
private val supertypes = mutableListOf<KmType>()

override fun visitSupertype(flags: Flags): KmTypeVisitor? =
KmType(flags).also { supertypes += it }

override fun visitProperty(flags: Flags, name: String, getterFlags: Flags, setterFlags: Flags): KmPropertyVisitor? =
PropertyFilter(KmProperty(flags, name, getterFlags, setterFlags), super.visitProperty(flags, name, getterFlags, setterFlags)!!)
override fun visitFunction(flags: Flags, name: String): KmFunctionVisitor =
FunctionFilter(KmFunction(flags, name), super.visitFunction(flags, name)!!)

override fun visitEnd() {
// Skip supertype if it is SynchronizedObject (it is an alias to Any)
supertypes.forEach { type ->
private fun KmClass.transformKmClass() =
apply {
supertypes.replaceAll { type ->
if (type.abbreviatedType?.classifier == SynchronizedObjectAlias) {
KmType().apply {
visitClass("kotlin/Any")
}.accept(super.visitSupertype(flagsOf(Flag.IS_PUBLIC, Flag.IS_OPEN))!!)
transformed = true
} else
type.accept(super.visitSupertype(type.flags)!!)
classifier = KmClassifier.Class("kotlin/Any")
}
} else {
type
}
}
super.visitEnd()
removeAtomicfuDeclarations()
}
}

private inner class PackageFilter(v: KmPackageVisitor?) : KmPackageVisitor(v) {
override fun visitProperty(flags: Flags, name: String, getterFlags: Flags, setterFlags: Flags): KmPropertyVisitor? =
PropertyFilter(KmProperty(flags, name, getterFlags, setterFlags), super.visitProperty(flags, name, getterFlags, setterFlags)!!)
override fun visitFunction(flags: Flags, name: String): KmFunctionVisitor =
FunctionFilter(KmFunction(flags, name), super.visitFunction(flags, name)!!)
}

private class PropertyExtensionNode : JvmPropertyExtensionVisitor() {
private var jvmFlags: Flags? = null
var fieldSignature: JvmFieldSignature? = null
private var getterSignature: JvmMethodSignature? = null
private var setterSignature: JvmMethodSignature? = null
private var syntheticMethodForAnnotationsDesc: JvmMethodSignature? = null

override fun visit(
jvmFlags: Flags,
fieldSignature: JvmFieldSignature?,
getterSignature: JvmMethodSignature?,
setterSignature: JvmMethodSignature?
) {
check(this.jvmFlags == null)
this.jvmFlags = jvmFlags
this.fieldSignature = fieldSignature
this.getterSignature = getterSignature
this.setterSignature = setterSignature
}

override fun visitSyntheticMethodForAnnotations(signature: JvmMethodSignature?) {
check(syntheticMethodForAnnotationsDesc == null)
this.syntheticMethodForAnnotationsDesc = signature
}

fun accept(v : JvmPropertyExtensionVisitor) {
if (jvmFlags != null) {
v.visit(jvmFlags!!, fieldSignature, getterSignature, setterSignature)
private fun <T : KmDeclarationContainer> T.removeAtomicfuDeclarations(): T =
apply {
functions.removeIf { it.signature in removeMethodSignatures }
properties.removeIf { it.fieldSignature in removeFieldSignatures }
properties.forEach { property ->
property.apply {
receiverParameterType?.fixType { property.receiverParameterType = it }
returnType.fixType { property.returnType = it }
}
}
syntheticMethodForAnnotationsDesc?.let { v.visitSyntheticMethodForAnnotations(it) }
v.visitEnd()
}
}

private inner class PropertyFilter(
private val delegate: KmProperty,
private val v: KmPropertyVisitor
) : KmPropertyVisitor(delegate) {
private var extension: PropertyExtensionNode? = null

override fun visitExtensions(type: KmExtensionType): KmPropertyExtensionVisitor? {
check(type == JvmPropertyExtensionVisitor.TYPE)
check(extension == null)
return PropertyExtensionNode().also { extension = it }
}

override fun visitEnd() {
if (extension?.fieldSignature in removeFieldSignatures) {
// remove this function
transformed = true
return
}
delegate.receiverParameterType?.fixType { delegate.receiverParameterType = it }
delegate.returnType.fixType { delegate.returnType = it }
// keeping this property
extension?.accept(delegate.visitExtensions(JvmPropertyExtensionVisitor.TYPE) as JvmPropertyExtensionVisitor)
delegate.accept(v)
}
}

private class FunctionExtensionNode : JvmFunctionExtensionVisitor() {
var signature: JvmMethodSignature? = null
private var originalInternalName: String? = null

override fun visit(signature: JvmMethodSignature?) {
check(this.signature == null)
this.signature = signature
}

override fun visitLambdaClassOriginName(internalName: String) {
check(originalInternalName == null)
originalInternalName = internalName
}

fun accept(v : JvmFunctionExtensionVisitor) {
signature?.let { v.visit(it) }
originalInternalName?.let { v.visitLambdaClassOriginName(it) }
v.visitEnd()
}
}

private inner class FunctionFilter(
private val delegate: KmFunction,
private val v: KmFunctionVisitor
) : KmFunctionVisitor(delegate) {
private var extension: FunctionExtensionNode? = null

override fun visitExtensions(type: KmExtensionType): KmFunctionExtensionVisitor? {
check(type == JvmFunctionExtensionVisitor.TYPE)
check(extension == null)
return FunctionExtensionNode().also { extension = it }
}

override fun visitEnd() {
if (extension?.signature in removeMethodSignatures) {
// remove this function
transformed = true
return
}
// keeping this function
extension?.accept(delegate.visitExtensions(JvmFunctionExtensionVisitor.TYPE) as JvmFunctionExtensionVisitor)
delegate.accept(v)
}
}

private fun KmType.fixType(update: (KmType) -> Unit) {
if (this.abbreviatedType?.classifier == ReentrantLockAlias) {
update(ReentrantLockType)
transformed = true
}
}
}

private val SynchronizedObjectAlias = KmClassifier.TypeAlias("kotlinx/atomicfu/locks/SynchronizedObject")

private val ReentrantLockAlias = KmClassifier.TypeAlias("kotlinx/atomicfu/locks/ReentrantLock")
private val ReentrantLockType = KmType(0).apply {
private val ReentrantLockType = KmType().apply {
classifier = KmClassifier.Class("java/util/concurrent/locks/ReentrantLock")
}

Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[versions]
kotlin = "2.0.0"
kotlinx-metadata = "0.7.0"
kotlinx-binaryCompatibilityValidator = "0.13.2"
asm = "9.6"
slf4j = "1.8.0-alpha2"
Expand All @@ -20,7 +19,7 @@ kotlin-stdlibJdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
kotlin-testJunit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
kotlin-scriptRuntime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
kotlinx-metadataJvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-metadata-jvm", version.ref = "kotlinx-metadata" }
kotlin-metadataJvm = { group = "org.jetbrains.kotlin", name = "kotlin-metadata-jvm", version.ref = "kotlin" }

# ASM dependencies
asm = { group = "org.ow2.asm", name = "asm", version.ref = "asm" }
Expand Down

0 comments on commit fbdf1c7

Please sign in to comment.