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

JVM IR: Move $assertionsDisabled field to interface DefaultImpls

Browse Source
This commit is contained in:
Steven Schäfer
2020-02-19 11:30:26 +01:00
committed by Ilmir Usmanov
parent 0ed719f792
commit 3cf71c1d2b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt
+9 -8
View File
@@ -161,14 +161,15 @@ internal class InterfaceLowering(val context: JvmBackendContext) : IrElementTran
context.localDelegatedProperties[irClass.attributeOwnerId as IrClass] = emptyList<IrLocalDelegatedPropertySymbol>() context.localDelegatedProperties[irClass.attributeOwnerId as IrClass] = emptyList<IrLocalDelegatedPropertySymbol>()
} }
// Move $$delegatedProperties array // Move $$delegatedProperties array and $assertionsDisabled field
val delegatedPropertyArray = irClass.declarations.filterIsInstance<IrField>() for (field in irClass.declarations.filterIsInstance<IrField>()) {
.singleOrNull { it.origin == JvmLoweredDeclarationOrigin.GENERATED_PROPERTY_REFERENCE } if (field.origin != JvmLoweredDeclarationOrigin.GENERATED_PROPERTY_REFERENCE && field.origin != JvmLoweredDeclarationOrigin.GENERATED_ASSERTION_ENABLED_FIELD)
if (delegatedPropertyArray != null) { continue
irClass.declarations.remove(delegatedPropertyArray)
defaultImplsIrClass.declarations.add(0, delegatedPropertyArray) irClass.declarations.remove(field)
delegatedPropertyArray.parent = defaultImplsIrClass defaultImplsIrClass.declarations.add(0, field)
delegatedPropertyArray.initializer?.patchDeclarationParents(defaultImplsIrClass) field.parent = defaultImplsIrClass
field.initializer?.patchDeclarationParents(defaultImplsIrClass)
} }
} }