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

Workaround for KT-9603

Browse Source
This commit is contained in:
Michael Bogdanov
2015-10-15 14:29:59 +03:00
committed by Max Kammerer
parent 7022d84ec1
commit e2eddac27d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+6 -2
View File
@@ -174,13 +174,17 @@ public class JetTypeMapper {
@NotNull @NotNull
private String internalNameForPackageMemberOwner(@NotNull CallableMemberDescriptor descriptor, boolean isImplementation) { private String internalNameForPackageMemberOwner(@NotNull CallableMemberDescriptor descriptor, boolean isImplementation) {
if (descriptor instanceof AccessorForCallableDescriptor) { boolean isAccessor = descriptor instanceof AccessorForCallableDescriptor;
if (isAccessor) {
descriptor = ((AccessorForCallableDescriptor) descriptor).getCalleeDescriptor(); descriptor = ((AccessorForCallableDescriptor) descriptor).getCalleeDescriptor();
} }
JetFile file = DescriptorToSourceUtils.getContainingFile(descriptor); JetFile file = DescriptorToSourceUtils.getContainingFile(descriptor);
if (file != null) { if (file != null) {
Visibility visibility = descriptor.getVisibility(); 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); return FileClasses.getFileClassInternalName(fileClassesProvider, file);
} }
else { else {