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

JVM IR: do not mangle property accessors of unsigned types in annotations

Browse Source 
Before this change, we incorrectly mangled the names of annotation
methods (e.g. `getI-pVg5ArA` instead of `i`) because the isSpecial
condition was false.
This commit is contained in:
Alexander Udalov
2020-08-28 21:47:10 +02:00
parent 1e360d9c91
commit a639915a34
5 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
+5 -3
View File
@@ -81,7 +81,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
}
val property = (function as? IrSimpleFunction)?.correspondingPropertySymbol?.owner
if (property != null && function.name.isSpecial) {
if (property != null) {
val propertyName = property.name.asString()
val propertyParent = property.parentAsClass
if (propertyParent.isAnnotationClass)
@@ -93,8 +93,10 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
if ((propertyParent.isEnumClass || propertyParent.isEnumEntry) && (propertyName == "name" || propertyName == "ordinal"))
return propertyName
val accessorName = if (function.isGetter) JvmAbi.getterName(propertyName) else JvmAbi.setterName(propertyName)
return mangleMemberNameIfRequired(accessorName, function)
if (function.name.isSpecial) {
val accessorName = if (function.isGetter) JvmAbi.getterName(propertyName) else JvmAbi.setterName(propertyName)
return mangleMemberNameIfRequired(accessorName, function)
}
}
return mangleMemberNameIfRequired(function.name.asString(), function)