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

Delete outdated hack

Browse Source
This commit is contained in:
Alexander Udalov
2013-12-30 00:56:32 +04:00
parent 713c6f13ae
commit 0a552dbb04
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+2 -4
View File
@@ -472,13 +472,11 @@ public class JetTypeMapper extends BindingTraceAware {
receiver = currentOwner; receiver = currentOwner;
} }
// TODO: TYPE_PARAMETER is hack here
boolean isInterface = originalIsInterface && currentIsInterface; boolean isInterface = originalIsInterface && currentIsInterface;
owner = mapType(receiver.getDefaultType(), JetTypeMapperMode.TYPE_PARAMETER); owner = mapClass(receiver);
ClassDescriptor declarationOwnerForDefault = (ClassDescriptor) findBaseDeclaration(functionDescriptor).getContainingDeclaration(); ClassDescriptor declarationOwnerForDefault = (ClassDescriptor) findBaseDeclaration(functionDescriptor).getContainingDeclaration();
ownerForDefaultParam = mapType(declarationOwnerForDefault.getDefaultType(), JetTypeMapperMode.TYPE_PARAMETER); ownerForDefaultParam = mapClass(declarationOwnerForDefault);
ownerForDefaultImpl = Type.getObjectType( ownerForDefaultImpl = Type.getObjectType(
ownerForDefaultParam.getInternalName() + (isInterface(declarationOwnerForDefault) ? JvmAbi.TRAIT_IMPL_SUFFIX : "")); ownerForDefaultParam.getInternalName() + (isInterface(declarationOwnerForDefault) ? JvmAbi.TRAIT_IMPL_SUFFIX : ""));
if (isInterface) { if (isInterface) {