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

Revert "Deprecate DefaultImpl methods in compatibility mode"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+2 -5
View File
@@ -193,9 +193,6 @@ public class FunctionCodegen {
if (origin.getOriginKind() == JvmDeclarationOriginKind.SAM_DELEGATION) { if (origin.getOriginKind() == JvmDeclarationOriginKind.SAM_DELEGATION) {
flags |= ACC_SYNTHETIC; flags |= ACC_SYNTHETIC;
} }
if (isCompatibilityStubInDefaultImpls(functionDescriptor, methodContext, state.getJvmDefaultMode())) {
flags |= ACC_DEPRECATED;
}
if (functionDescriptor.isExternal() && owner instanceof MultifileClassFacadeContext) { if (functionDescriptor.isExternal() && owner instanceof MultifileClassFacadeContext) {
// Native methods are only defined in facades and do not need package part implementations // Native methods are only defined in facades and do not need package part implementations
@@ -715,9 +712,9 @@ public class FunctionCodegen {
@NotNull JvmDefaultMode jvmDefaultMode @NotNull JvmDefaultMode jvmDefaultMode
) { ) {
return OwnerKind.DEFAULT_IMPLS == context.getContextKind() && return OwnerKind.DEFAULT_IMPLS == context.getContextKind() &&
jvmDefaultMode.isCompatibility() &&
JvmAnnotationUtilKt.isCompiledToJvmDefault(DescriptorUtils.unwrapFakeOverrideToAnyDeclaration(functionDescriptor), JvmAnnotationUtilKt.isCompiledToJvmDefault(DescriptorUtils.unwrapFakeOverrideToAnyDeclaration(functionDescriptor),
jvmDefaultMode); jvmDefaultMode) &&
jvmDefaultMode.isCompatibility();
} }
private static void generateLocalVariableTable( private static void generateLocalVariableTable(
compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt
Vendored
+2 -2
View File
@@ -19,7 +19,7 @@ public interface NoDefaultImpl2FromDefaultImpls {
@kotlin.Metadata @kotlin.Metadata
public final class WithDefaultImpl$DefaultImpls { public final class WithDefaultImpl$DefaultImpls {
inner 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 @kotlin.Metadata
@@ -31,7 +31,7 @@ public interface WithDefaultImpl {
@kotlin.Metadata @kotlin.Metadata
public final class WithDefaultImplPure$DefaultImpls { public final class WithDefaultImplPure$DefaultImpls {
inner 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 @kotlin.Metadata
compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt
Vendored
+3 -3
View File
@@ -11,7 +11,7 @@ public class B {
@kotlin.Metadata @kotlin.Metadata
public final class Base$DefaultImpls { public final class Base$DefaultImpls {
inner 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 @kotlin.Metadata
@@ -24,7 +24,7 @@ public interface Base {
@kotlin.Metadata @kotlin.Metadata
public final class Derived$DefaultImpls { public final class Derived$DefaultImpls {
inner 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 @kotlin.Metadata
@@ -37,7 +37,7 @@ public interface Derived {
@kotlin.Metadata @kotlin.Metadata
public final class Mixed$DefaultImpls { public final class Mixed$DefaultImpls {
inner 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 @kotlin.Metadata
compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt
Vendored
+3 -3
View File
@@ -11,7 +11,7 @@ public class B {
@kotlin.Metadata @kotlin.Metadata
public final class Base$DefaultImpls { public final class Base$DefaultImpls {
inner 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 @kotlin.Metadata
@@ -24,7 +24,7 @@ public interface Base {
@kotlin.Metadata @kotlin.Metadata
public final class Derived$DefaultImpls { public final class Derived$DefaultImpls {
inner 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 @kotlin.Metadata
@@ -37,7 +37,7 @@ public interface Derived {
@kotlin.Metadata @kotlin.Metadata
public final class Mixed$DefaultImpls { public final class Mixed$DefaultImpls {
inner 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 @kotlin.Metadata