From e3a23aed333b4bfd14327aa7c4833fdd7161cb34 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 9 Jun 2020 15:15:24 +0200 Subject: [PATCH] Minor, remove unneeded check in ClosureCodegen Actually we do need to generate delegates to DefaultImpls even for Java SAM wrappers, so this condition is incorrect. However, this never worked properly anyway because of KT-12466. --- .../src/org/jetbrains/kotlin/codegen/ClosureCodegen.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 793bc4cde84..31a33ca3c8b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.metadata.ProtoBuf; import org.jetbrains.kotlin.psi.KtElement; @@ -187,10 +186,9 @@ public class ClosureCodegen extends MemberCodegen { generateClosureBody(); if (samType != null) { - ClassDescriptor funInterface = samType.getClassDescriptor(); - if (!(funInterface instanceof JavaClassDescriptor)) { - SamWrapperCodegen.generateDelegatesToDefaultImpl(asmType, classDescriptor, funInterface, functionCodegen, state); - } + SamWrapperCodegen.generateDelegatesToDefaultImpl( + asmType, classDescriptor, samType.getClassDescriptor(), functionCodegen, state + ); } this.constructor = generateConstructor();