Kristoffer Andersen
6f8682c950
- introduce a scoped counter instead of a global one for name
generation for accessors. Naive solution not working.
- Introduced hardcoded "jd" suffix for accessors on interfaces, under
the assumption that the only such accessors are due to JvmDefault
and their bridges from `$DefaultImpls`. Removed all associated
templated tests, so the old and IR backend correspond on this matter
again.
- Respecialized writeFlags from regexps to string-equality: we are
going for exact matches now!
- Fixed package calculation in `IrUtils.kt`.
- Accessors for static members must be due to accessing super
classes. Actual super-qualified calls are naturally also accessing
super classes. Hence the `$s+{hashcode(superClassName)}`
suffix. Added test to affirm this naming scheme.
- Field getters/setters for static fields must be companion accessors,
otherwise just labelled as accessors. They are also tagged with `s`
suffix when accessing static fields.
- For naming of accessors to coincide with the old backend, field
renaming to avoid JVM signature clashes must be done _after_
generation of accessors for those fields.
35 lines
934 B
Kotlin
Vendored
35 lines
934 B
Kotlin
Vendored
// Checks that accessor methods are always used due to the overriding of the default setter of 'my' property.
|
|
|
|
class My {
|
|
companion object {
|
|
private var my: String = "OK"
|
|
set(value) { field = value }
|
|
}
|
|
|
|
fun getMyValue(): String {
|
|
// INVOKESTATIC My$Companion.access$setMy$p
|
|
my = "Overriden value"
|
|
// GETSTATIC My.my
|
|
return my
|
|
}
|
|
|
|
// PUTSTATIC My.my into clinit
|
|
// PUTSTATIC My.my into 'access$setMy$cp'
|
|
// GETSTATIC My.my into 'access$getMy$cp'
|
|
}
|
|
|
|
// 2 PUTSTATIC My.my
|
|
// 0 INVOKESTATIC My\$Companion.access\$getMy\$p
|
|
// 1 INVOKESTATIC My.access\$setMy\$cp
|
|
// 1 INVOKESPECIAL My\$Companion.setMy
|
|
|
|
// JVM_TEMPLATES
|
|
// 2 GETSTATIC My.my
|
|
// 1 INVOKESTATIC My\$Companion.access\$setMy\$p
|
|
// 1 INVOKESTATIC My.access\$getMy\$cp
|
|
// 1 INVOKESPECIAL My\$Companion.getMy
|
|
|
|
// IR only generates the accessors actually needed
|
|
// JVM_IR_TEMPLATES
|
|
// 1 GETSTATIC My.my
|