From e2eddac27d5208bd47bd65039c1c46829de309cc Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Thu, 15 Oct 2015 14:29:59 +0300 Subject: [PATCH] Workaround for KT-9603 --- .../org/jetbrains/kotlin/codegen/state/JetTypeMapper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index ab8f8daea6d..458d9ce848e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -174,13 +174,17 @@ public class JetTypeMapper { @NotNull private String internalNameForPackageMemberOwner(@NotNull CallableMemberDescriptor descriptor, boolean isImplementation) { - if (descriptor instanceof AccessorForCallableDescriptor) { + boolean isAccessor = descriptor instanceof AccessorForCallableDescriptor; + if (isAccessor) { descriptor = ((AccessorForCallableDescriptor) descriptor).getCalleeDescriptor(); } JetFile file = DescriptorToSourceUtils.getContainingFile(descriptor); if (file != null) { Visibility visibility = descriptor.getVisibility(); - if (isImplementation || descriptor instanceof PropertyDescriptor || Visibilities.isPrivate(visibility)) { + if (isImplementation || + descriptor instanceof PropertyDescriptor || + Visibilities.isPrivate(visibility) || + isAccessor/*Cause of KT-9603*/) { return FileClasses.getFileClassInternalName(fileClassesProvider, file); } else {