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

Minor. Remove hack

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-05-25 15:28:10 +02:00
parent b7bad2bd72
commit 1d6665d355
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+3 -3
View File
@@ -725,8 +725,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
@Override
public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
markLineNumberForElement(element.getPsiOrParent(), codegen.v);
if (accessor.getName().asString().endsWith("$" + AccessorKind.JVM_DEFAULT_COMPATIBILITY.getSuffix())) {
//TODO pass kind
if (accessorForCallableDescriptor.getAccessorKind() == AccessorKind.JVM_DEFAULT_COMPATIBILITY) {
FunctionDescriptor descriptor = unwrapFakeOverrideToAnyDeclaration(original).getOriginal();
if (descriptor != original) {
descriptor = descriptor
@@ -828,7 +827,8 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
CallableMethod callableMethod = typeMapper.mapToCallableMethod(
functionDescriptor,
accessorDescriptor instanceof AccessorForCallableDescriptor &&
((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallTarget() != null
(((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallTarget() != null ||
((AccessorForCallableDescriptor) accessorDescriptor).getAccessorKind() == AccessorKind.JVM_DEFAULT_COMPATIBILITY)
);
boolean isJvmStaticInObjectOrClass = CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(functionDescriptor);
compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
+1 -2
View File
@@ -410,8 +410,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
public <D extends CallableMemberDescriptor> D getAccessorForJvmDefaultCompatibility(@NotNull D descriptor) {
return getAccessor(descriptor, AccessorKind.JVM_DEFAULT_COMPATIBILITY, null,
(ClassDescriptor) descriptor.getContainingDeclaration());
return getAccessor(descriptor, AccessorKind.JVM_DEFAULT_COMPATIBILITY, null, null);
}
@NotNull