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

Don't copy interface member on DefaultImpl delegation generation, keep kind

Browse Source 
Old logic is redundant and obsolete
This commit is contained in:
Mikhael Bogdanov
2018-05-25 13:49:56 +02:00
parent 4421b41790
commit 9b718e83a9
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
+3 -7
View File
@@ -72,21 +72,17 @@ class InterfaceImplBodyCodegen(
// If implementation is a default interface method (JVM 8 only) // If implementation is a default interface method (JVM 8 only)
if (implementation.isDefinitelyNotDefaultImplsMethod()) continue if (implementation.isDefinitelyNotDefaultImplsMethod()) continue
// We create a copy of the function with kind = DECLARATION so that FunctionCodegen will generate its body
val copy = memberDescriptor.copy(memberDescriptor.containingDeclaration, Modality.OPEN, memberDescriptor.visibility,
CallableMemberDescriptor.Kind.DECLARATION, true)
if (memberDescriptor is FunctionDescriptor) { if (memberDescriptor is FunctionDescriptor) {
generateDelegationToSuperDefaultImpls(copy as FunctionDescriptor, implementation as FunctionDescriptor) generateDelegationToSuperDefaultImpls(memberDescriptor, implementation as FunctionDescriptor)
} }
else if (memberDescriptor is PropertyDescriptor) { else if (memberDescriptor is PropertyDescriptor) {
implementation as PropertyDescriptor implementation as PropertyDescriptor
val getter = (copy as PropertyDescriptor).getter val getter = memberDescriptor.getter
val implGetter = implementation.getter val implGetter = implementation.getter
if (getter != null && implGetter != null) { if (getter != null && implGetter != null) {
generateDelegationToSuperDefaultImpls(getter, implGetter) generateDelegationToSuperDefaultImpls(getter, implGetter)
} }
val setter = copy.setter val setter = memberDescriptor.setter
val implSetter = implementation.setter val implSetter = implementation.setter
if (setter != null && implSetter != null) { if (setter != null && implSetter != null) {
generateDelegationToSuperDefaultImpls(setter, implSetter) generateDelegationToSuperDefaultImpls(setter, implSetter)