Revert "Deprecate DefaultImpl methods in compatibility mode"

This reverts commit 6c9c2a28
This commit is contained in:
Mikhail Bogdanov
2020-06-19 12:58:46 +02:00
parent 8bc4407be0
commit e93bcc55ae
4 changed files with 10 additions and 13 deletions
@@ -193,9 +193,6 @@ public class FunctionCodegen {
if (origin.getOriginKind() == JvmDeclarationOriginKind.SAM_DELEGATION) {
flags |= ACC_SYNTHETIC;
}
if (isCompatibilityStubInDefaultImpls(functionDescriptor, methodContext, state.getJvmDefaultMode())) {
flags |= ACC_DEPRECATED;
}
if (functionDescriptor.isExternal() && owner instanceof MultifileClassFacadeContext) {
// Native methods are only defined in facades and do not need package part implementations
@@ -715,9 +712,9 @@ public class FunctionCodegen {
@NotNull JvmDefaultMode jvmDefaultMode
) {
return OwnerKind.DEFAULT_IMPLS == context.getContextKind() &&
jvmDefaultMode.isCompatibility() &&
JvmAnnotationUtilKt.isCompiledToJvmDefault(DescriptorUtils.unwrapFakeOverrideToAnyDeclaration(functionDescriptor),
jvmDefaultMode);
jvmDefaultMode) &&
jvmDefaultMode.isCompatibility();
}
private static void generateLocalVariableTable(