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

IR common: use .isFakeOverride instead of checking origin

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-03-26 19:33:53 +03:00
committed by romanart
parent 2784e30fd4
commit fb6956f842
2 changed files with 2 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/DefaultArgumentStubGenerator.kt
+1 -1
View File
@@ -57,7 +57,7 @@ open class DefaultArgumentStubGenerator(
val newIrFunction = val newIrFunction =
irFunction.generateDefaultsFunction(context, skipInlineMethods, skipExternalMethods, forceSetOverrideSymbols, visibility) irFunction.generateDefaultsFunction(context, skipInlineMethods, skipExternalMethods, forceSetOverrideSymbols, visibility)
?: return null ?: return null
if (newIrFunction.origin == IrDeclarationOrigin.FAKE_OVERRIDE) { if (newIrFunction.isFakeOverride) {
return listOf(irFunction, newIrFunction) return listOf(irFunction, newIrFunction)
} }
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt
+1 -1
View File
@@ -213,4 +213,4 @@ private fun CommonBackendContext.buildOrGetNullableField(originalField: IrField)
} }
} }
private val IrProperty.isRealLateinit get() = isLateinit && origin != IrDeclarationOrigin.FAKE_OVERRIDE private val IrProperty.isRealLateinit get() = isLateinit && getter?.isFakeOverride != true