From 0a552dbb0449908fdc949921d9b67bbbb7bb6425 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 30 Dec 2013 00:56:32 +0400 Subject: [PATCH] Delete outdated hack --- .../src/org/jetbrains/jet/codegen/state/JetTypeMapper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index 456fdb051ab..7e7b3fbc6b1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -472,13 +472,11 @@ public class JetTypeMapper extends BindingTraceAware { receiver = currentOwner; } - // TODO: TYPE_PARAMETER is hack here - boolean isInterface = originalIsInterface && currentIsInterface; - owner = mapType(receiver.getDefaultType(), JetTypeMapperMode.TYPE_PARAMETER); + owner = mapClass(receiver); ClassDescriptor declarationOwnerForDefault = (ClassDescriptor) findBaseDeclaration(functionDescriptor).getContainingDeclaration(); - ownerForDefaultParam = mapType(declarationOwnerForDefault.getDefaultType(), JetTypeMapperMode.TYPE_PARAMETER); + ownerForDefaultParam = mapClass(declarationOwnerForDefault); ownerForDefaultImpl = Type.getObjectType( ownerForDefaultParam.getInternalName() + (isInterface(declarationOwnerForDefault) ? JvmAbi.TRAIT_IMPL_SUFFIX : "")); if (isInterface) {