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

JVM_IR: compute signatures for fake overrides of Java fields

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-05-20 21:11:04 +03:00
committed by TeamCityServer
parent 8c3386b607
commit c3f4fcde0b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
+9 -5
View File
@@ -14,10 +14,7 @@ import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.isFacadeClass import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.util.isVararg
import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.ir.util.render
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
@@ -234,7 +231,14 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
typeParameterContainer.add(declaration) typeParameterContainer.add(declaration)
declaration.parent.acceptVoid(this) declaration.parent.acceptVoid(this)
val isStaticProperty = accessor != null && accessor.dispatchReceiverParameter == null && declaration.parent !is IrPackageFragment val isStaticProperty = if (accessor != null)
accessor.let { it.dispatchReceiverParameter == null && declaration.parent !is IrPackageFragment }
else {
// Fake override for a Java field
val backingField = declaration.resolveFakeOverride()?.backingField
?: error("Expected at least one accessor or a backing field for property ${declaration.render()}")
backingField.isStatic
}
if (isStaticProperty) { if (isStaticProperty) {
builder.appendSignature(MangleConstant.STATIC_MEMBER_MARK) builder.appendSignature(MangleConstant.STATIC_MEMBER_MARK)