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

IR: Postpone computing real fake overrides at SyntheticAccessorLowering

Browse Source
This commit is contained in:
Denis.Zharkov
2021-02-24 15:22:49 +03:00
parent c09fe3ea6f
commit 1a36ee2110
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt
+6 -5
View File
@@ -632,17 +632,15 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle
val symbolOwner = owner val symbolOwner = owner
val declarationRaw = symbolOwner as IrDeclarationWithVisibility val declarationRaw = symbolOwner as IrDeclarationWithVisibility
val declaration =
(declarationRaw as? IrSimpleFunction)?.resolveFakeOverride(allowAbstract = true) ?: declarationRaw
// There is never a problem with visibility of inline functions, as those don't end up as Java entities // There is never a problem with visibility of inline functions, as those don't end up as Java entities
if (declaration is IrFunction && declaration.isInline) return true if (declarationRaw is IrFunction && declarationRaw.isInline) return true
// Enum entry constructors are generated as package-private and are accessed only from corresponding enum class // Enum entry constructors are generated as package-private and are accessed only from corresponding enum class
if (declaration is IrConstructor && declaration.constructedClass.isEnumEntry) return true if (declarationRaw is IrConstructor && declarationRaw.constructedClass.isEnumEntry) return true
// `internal` maps to public and requires no accessor. // `internal` maps to public and requires no accessor.
if (!withSuper && !declaration.visibility.isPrivate && !declaration.visibility.isProtected) return true if (!withSuper && !declarationRaw.visibility.isPrivate && !declarationRaw.visibility.isProtected) return true
// `toArray` is always accessible cause mapped to public functions // `toArray` is always accessible cause mapped to public functions
if (symbolOwner is IrSimpleFunction && (symbolOwner.isNonGenericToArray() || symbolOwner.isGenericToArray(context))) { if (symbolOwner is IrSimpleFunction && (symbolOwner.isNonGenericToArray() || symbolOwner.isGenericToArray(context))) {
@@ -655,6 +653,9 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle
if (symbolOwner is IrConstructor && symbolOwner.parentClassOrNull?.isEnumEntry == true) if (symbolOwner is IrConstructor && symbolOwner.parentClassOrNull?.isEnumEntry == true)
return true return true
val declaration =
(declarationRaw as? IrSimpleFunction)?.resolveFakeOverride(allowAbstract = true) ?: declarationRaw
// If local variables are accessible by Kotlin rules, they also are by Java rules. // If local variables are accessible by Kotlin rules, they also are by Java rules.
val ownerClass = declaration.parent as? IrClass ?: return true val ownerClass = declaration.parent as? IrClass ?: return true