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

IR: add skipExternalProperties flag to PropertiesLowering

Browse Source 
Same problem as in deafult argument lowering: JVM and JS semantics differ.
Same solution: skip in common lowerings, process if needed in platform ones.
This commit is contained in:
Anton Bannykh
2019-03-13 16:08:18 +03:00
parent 9a56b0e6d6
commit 0249e33f3e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/PropertiesLowering.kt
+2 -1
View File
@@ -28,6 +28,7 @@ import java.util.*
class PropertiesLowering( class PropertiesLowering(
private val context: BackendContext, private val context: BackendContext,
private val originOfSyntheticMethodForAnnotations: IrDeclarationOrigin? = null, private val originOfSyntheticMethodForAnnotations: IrDeclarationOrigin? = null,
private val skipExternalProperties: Boolean = false,
private val computeSyntheticMethodName: ((Name) -> String)? = null private val computeSyntheticMethodName: ((Name) -> String)? = null
) : IrElementTransformerVoid(), FileLoweringPass { ) : IrElementTransformerVoid(), FileLoweringPass {
override fun lower(irFile: IrFile) { override fun lower(irFile: IrFile) {
@@ -48,7 +49,7 @@ class PropertiesLowering(
private fun lowerProperty(declaration: IrDeclaration, kind: ClassKind): List<IrDeclaration>? = private fun lowerProperty(declaration: IrDeclaration, kind: ClassKind): List<IrDeclaration>? =
if (declaration is IrProperty) if (declaration is IrProperty)
if (declaration.isEffectivelyExternal()) listOf(declaration) else { if (skipExternalProperties && declaration.isEffectivelyExternal()) listOf(declaration) else {
ArrayList<IrDeclaration>(4).apply { ArrayList<IrDeclaration>(4).apply {
// JvmFields in a companion object refer to companion's owners and should not be generated within companion. // JvmFields in a companion object refer to companion's owners and should not be generated within companion.
if (kind != ClassKind.ANNOTATION_CLASS && declaration.backingField?.parent == declaration.parent) { if (kind != ClassKind.ANNOTATION_CLASS && declaration.backingField?.parent == declaration.parent) {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
+1 -1
View File
@@ -240,7 +240,7 @@ private val varargLoweringPhase = makeJsModulePhase(
) )
private val propertiesLoweringPhase = makeJsModulePhase( private val propertiesLoweringPhase = makeJsModulePhase(
{ context -> PropertiesLowering(context) }, { context -> PropertiesLowering(context, skipExternalProperties = true) },
name = "PropertiesLowering", name = "PropertiesLowering",
description = "Move fields and accessors out from its property" description = "Move fields and accessors out from its property"
) )