From bfa0b69ba999653b6cf981d256941193ab21ccff Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 14 Mar 2016 16:48:06 +0300 Subject: [PATCH] Simplify SamCodegenUtil.getOriginalIfSamAdapter At the monent adapters are either: - synthetic extensions (no overrides) - static members: fake override always has one overridden from super class, that should be created as a result of SamAdapterDescriptor.createSubsitutedCopy(), hence should be instance of SamAdapterDescriptor --- .../src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java index adae76db700..a132599786d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java @@ -35,15 +35,6 @@ public class SamCodegenUtil { return ((SamAdapterExtensionFunctionDescriptor) original).getSourceFunction(); } - if (original.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) { - for (FunctionDescriptor overridden : original.getOverriddenDescriptors()) { - FunctionDescriptor originalIfSamAdapter = getOriginalIfSamAdapter(overridden); - if (originalIfSamAdapter != null) { - return originalIfSamAdapter; - } - } - } - return null; }