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

Generate synthetic method for @JvmDefault properties in DefaultImpls

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-05-28 11:38:25 +02:00
parent 5455b6c0c0
commit a0060dd25b
8 changed files with 124 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+7 -5
View File
@@ -181,7 +181,7 @@ public class FunctionCodegen {
OwnerKind contextKind = methodContext.getContextKind();
DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
if (isInterface(containingDeclaration) &&
!processInterfaceMethod(functionDescriptor, contextKind, false, state.getJvmDefaultMode())) {
!processInterfaceMethod(functionDescriptor, contextKind, false, false, state.getJvmDefaultMode())) {
return;
}
@@ -1149,7 +1149,7 @@ public class FunctionCodegen {
DeclarationDescriptor contextClass = owner.getContextDescriptor().getContainingDeclaration();
if (isInterface(contextClass) &&
!processInterfaceMethod(functionDescriptor, kind, true, state.getJvmDefaultMode())) {
!processInterfaceMethod(functionDescriptor, kind, true, false, state.getJvmDefaultMode())) {
return;
}
@@ -1579,7 +1579,8 @@ public class FunctionCodegen {
public static boolean processInterfaceMethod(
@NotNull CallableMemberDescriptor memberDescriptor,
@NotNull OwnerKind kind,
boolean isDefaultOrSynthetic,
boolean isDefault,
boolean isSynthetic,
JvmDefaultMode mode
) {
DeclarationDescriptor containingDeclaration = memberDescriptor.getContainingDeclaration();
@@ -1587,11 +1588,12 @@ public class FunctionCodegen {
containingDeclaration;
if (hasJvmDefaultAnnotation(memberDescriptor)) {
return kind != OwnerKind.DEFAULT_IMPLS || mode.isCompatibility();
return (kind != OwnerKind.DEFAULT_IMPLS && !isSynthetic) ||
(kind == OwnerKind.DEFAULT_IMPLS && (isSynthetic || mode.isCompatibility()));
} else {
switch (kind) {
case DEFAULT_IMPLS: return true;
case IMPLEMENTATION: return !Visibilities.isPrivate(memberDescriptor.getVisibility()) && !isDefaultOrSynthetic;
case IMPLEMENTATION: return !Visibilities.isPrivate(memberDescriptor.getVisibility()) && !isDefault && !isSynthetic;
default: return false;
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+1 -1
View File
@@ -353,7 +353,7 @@ public class PropertyCodegen {
if (annotations.getAllAnnotations().isEmpty()) return;
DeclarationDescriptor contextDescriptor = context.getContextDescriptor();
if (!isInterface(contextDescriptor) || processInterfaceMethod(descriptor, kind, true, state.getJvmDefaultMode())) {
if (!isInterface(contextDescriptor) || processInterfaceMethod(descriptor, kind, false, true, state.getJvmDefaultMode())) {
memberCodegen.generateSyntheticAnnotationsMethod(
descriptor, getSyntheticMethodSignature(descriptor), annotations, AnnotationUseSiteTarget.PROPERTY
);
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// JVM_TARGET: 1.8
// WITH_RUNTIME
// FILE: 1.kt
interface Test {
@JvmDefault
fun test(): String {
return "OK"
}
fun defaultImplTrigger(): String {
return "OK"
}
}
// FILE: 2.kt
interface Test2 : Test {
@JvmDefault
override fun test(): String {
return super.test()
}
}
fun box(): String {
return object : Test2 {}.test()
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// JVM_TARGET: 1.8
// WITH_RUNTIME
// FILE: 1.kt
interface Test {
@JvmDefault
val prop: String
get() = "OK"
val defaultImplTrigger: String
get() = "OK"
}
// FILE: 2.kt
interface Test2 : Test {
@JvmDefault
override val prop: String
get() = super.prop
}
fun box(): String {
return object : Test2 {}.prop
}
compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAnnotation.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// JVM_TARGET: 1.8
// WITH_RUNTIME
annotation class Property(val value: String)
interface Test {
@Property("OK")
@JvmDefault
val test: String
get() = "OK"
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Test, test$annotations
// ABSENT: TRUE
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Test$DefaultImpls, test$annotations
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED
compiler/testData/codegen/java8/writeFlags/defaults/propertyAnnotation.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// JVM_TARGET: 1.8
// WITH_RUNTIME
annotation class Property(val value: String)
interface Test {
@Property("OK")
@JvmDefault
val test: String
get() = "OK"
fun stub() {}
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Test, test$annotations
// ABSENT: TRUE
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Test$DefaultImpls, test$annotations
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED
compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
Generated
+10
View File
@@ -81,6 +81,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
runTest("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
}
@TestMetadata("superCallFromInterface2.kt")
public void testSuperCallFromInterface2() throws Exception {
runTest("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
}
@TestMetadata("superPropAccess.kt")
public void testSuperPropAccess() throws Exception {
runTest("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt");
@@ -90,6 +95,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
public void testSuperPropAccessFromInterface() throws Exception {
runTest("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
}
@TestMetadata("superPropAccessFromInterface2.kt")
public void testSuperPropAccessFromInterface2() throws Exception {
runTest("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
}
}
}
compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
Generated
+10
View File
@@ -61,6 +61,11 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt");
}
@TestMetadata("propertyAnnotation.kt")
public void testPropertyAnnotation() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/propertyAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/java8/writeFlags/defaults/compatibility")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -77,6 +82,11 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
public void testPropertyAccessors() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAccessors.kt");
}
@TestMetadata("propertyAnnotation.kt")
public void testPropertyAnnotation() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAnnotation.kt");
}
}
}
}