From e93bcc55ae10177c7e0494371db152fe5acdcb37 Mon Sep 17 00:00:00 2001 From: Mikhail Bogdanov Date: Fri, 19 Jun 2020 12:58:46 +0200 Subject: [PATCH] Revert "Deprecate DefaultImpl methods in compatibility mode" This reverts commit 6c9c2a28 --- .../src/org/jetbrains/kotlin/codegen/FunctionCodegen.java | 7 ++----- .../allCompatibility/jvmDefaultWithoutCompatibility.txt | 4 ++-- .../allCompatibility/specialization/primitiveAndAny.txt | 6 +++--- .../specialization/primitiveAndNullable.txt | 6 +++--- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 993ecde63e1..7e0387c29ad 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -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( diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt index 1988f81cba3..8073d5cf0ad 100644 --- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt +++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt @@ -19,7 +19,7 @@ public interface NoDefaultImpl2FromDefaultImpls { @kotlin.Metadata public final class WithDefaultImpl$DefaultImpls { inner class WithDefaultImpl$DefaultImpls - public deprecated static method test(@org.jetbrains.annotations.NotNull p0: WithDefaultImpl): void + public static method test(@org.jetbrains.annotations.NotNull p0: WithDefaultImpl): void } @kotlin.Metadata @@ -31,7 +31,7 @@ public interface WithDefaultImpl { @kotlin.Metadata public final class WithDefaultImplPure$DefaultImpls { inner class WithDefaultImplPure$DefaultImpls - public deprecated static method test(@org.jetbrains.annotations.NotNull p0: WithDefaultImplPure): void + public static method test(@org.jetbrains.annotations.NotNull p0: WithDefaultImplPure): void } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt index 9870079919a..ddefe138132 100644 --- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt +++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt @@ -11,7 +11,7 @@ public class B { @kotlin.Metadata public final class Base$DefaultImpls { inner class Base$DefaultImpls - public deprecated static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: Base): java.lang.Integer + public static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: Base): java.lang.Integer } @kotlin.Metadata @@ -24,7 +24,7 @@ public interface Base { @kotlin.Metadata public final class Derived$DefaultImpls { inner class Derived$DefaultImpls - public deprecated static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.Integer + public static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.Integer } @kotlin.Metadata @@ -37,7 +37,7 @@ public interface Derived { @kotlin.Metadata public final class Mixed$DefaultImpls { inner class Mixed$DefaultImpls - public deprecated static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Mixed): java.lang.Integer + public static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Mixed): java.lang.Integer } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt index 9870079919a..ddefe138132 100644 --- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt +++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt @@ -11,7 +11,7 @@ public class B { @kotlin.Metadata public final class Base$DefaultImpls { inner class Base$DefaultImpls - public deprecated static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: Base): java.lang.Integer + public static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: Base): java.lang.Integer } @kotlin.Metadata @@ -24,7 +24,7 @@ public interface Base { @kotlin.Metadata public final class Derived$DefaultImpls { inner class Derived$DefaultImpls - public deprecated static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.Integer + public static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.Integer } @kotlin.Metadata @@ -37,7 +37,7 @@ public interface Derived { @kotlin.Metadata public final class Mixed$DefaultImpls { inner class Mixed$DefaultImpls - public deprecated static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Mixed): java.lang.Integer + public static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Mixed): java.lang.Integer } @kotlin.Metadata