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

Generate private constructors for Enums

Browse Source 
#KT-2680 Fixed
  #KT-16867 Fixed
This commit is contained in:
Mikhael Bogdanov
2018-09-18 10:32:21 +02:00
parent c753a98d02
commit 38652372ce
11 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+2 -10
View File
@@ -549,16 +549,8 @@ public class AsmUtil {
return NO_FLAG_PACKAGE_PRIVATE;
}
// the following code is only for PRIVATE visibility of member
if (memberDescriptor instanceof ConstructorDescriptor) {
if (isEnumEntry(containingDeclaration)) {
return NO_FLAG_PACKAGE_PRIVATE;
}
if (isEnumClass(containingDeclaration)) {
//TODO: should be ACC_PRIVATE
// see http://youtrack.jetbrains.com/issue/KT-2680
return ACC_PROTECTED;
}
if (memberDescriptor instanceof ConstructorDescriptor && isEnumEntry(containingDeclaration)) {
return NO_FLAG_PACKAGE_PRIVATE;
}
return null;
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+5 -2
View File
@@ -70,6 +70,7 @@ import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isNullableAny;
import static org.jetbrains.kotlin.codegen.AsmUtil.*;
import static org.jetbrains.kotlin.codegen.CodegenUtilKt.generateBridgeForMainFunctionIfNecessary;
import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.METHOD_FOR_FUNCTION;
import static org.jetbrains.kotlin.codegen.state.KotlinTypeMapper.isAccessor;
import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION;
import static org.jetbrains.kotlin.descriptors.ModalityKt.isOverridable;
import static org.jetbrains.kotlin.descriptors.annotations.AnnotationUtilKt.isEffectivelyInlineOnly;
@@ -353,7 +354,7 @@ public class FunctionCodegen {
// base check
boolean isInlineClass = InlineClassesUtilsKt.isInlineClass(containingDeclaration);
boolean simpleFunctionOrProperty =
!(functionDescriptor instanceof ConstructorDescriptor) && !KotlinTypeMapper.isAccessor(functionDescriptor);
!(functionDescriptor instanceof ConstructorDescriptor) && !isAccessor(functionDescriptor);
return isInlineClass && simpleFunctionOrProperty;
}
@@ -511,12 +512,14 @@ public class FunctionCodegen {
KotlinTypeMapper typeMapper = state.getTypeMapper();
Iterator<ValueParameterDescriptor> iterator = valueParameters.iterator();
List<JvmMethodParameterSignature> kotlinParameterTypes = jvmSignature.getValueParameters();
boolean isAccessor = isAccessor(functionDescriptor);
for (int i = 0; i < kotlinParameterTypes.size(); i++) {
JvmMethodParameterSignature parameterSignature = kotlinParameterTypes.get(i);
JvmMethodParameterKind kind = parameterSignature.getKind();
if (kind.isSkippedInGenericSignature()) {
markEnumOrInnerConstructorParameterAsSynthetic(mv, i, state.getClassBuilderMode());
if (!isAccessor)
markEnumOrInnerConstructorParameterAsSynthetic(mv, i, state.getClassBuilderMode());
continue;
}
compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java
Vendored
+1 -1
View File
@@ -9,5 +9,5 @@ public enum E {
@kotlin.Deprecated(message = "b")
Entry3;
protected E() { /* compiled code */ }
private E() { /* compiled code */ }
}
compiler/testData/codegen/box/enum/annotatedParameter.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// TARGET_BACKEND: JVM
// FILE: Foo.java
public class Foo {
static String test() {
return KEnum.O.name() + KEnum.O.getValue();
}
}
// FILE: KEnum.kt
@Retention(AnnotationRetention.RUNTIME)
annotation class A
enum class KEnum(@A val value: Any) {
O("K")
}
fun box(): String {
return Foo.test();
}
compiler/testData/codegen/box/enum/annotatedParameter2.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
// TARGET_BACKEND: JVM
// FILE: Foo.java
public class Foo {
static String test() {
return KEnum.O.name() + KEnum.O.getValue();
}
}
// FILE: KEnum.kt
@Retention(AnnotationRetention.RUNTIME)
annotation class A
enum class KEnum(@A val value: Any) {
O("K") {
fun foo() {}
}
}
fun box(): String {
return Foo.test()
}
compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ public final enum class TestEnum {
public final static field ANSWER: TestEnum
private final field z: int
static method <clinit>(): void
protected method <init>(p0: java.lang.String, p1: int, p2: int): void
private method <init>(p0: java.lang.String, p1: int, p2: int): void
public final method getZ(): int
public static method valueOf(p0: java.lang.String): TestEnum
public static method values(): TestEnum[]
compiler/testData/writeFlags/function/constructors/enum.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
enum class Foo {
A, B, C
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Foo, <init>
// FLAGS: ACC_PRIVATE
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -9598,6 +9598,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/enum"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("annotatedParameter.kt")
public void testAnnotatedParameter() throws Exception {
runTest("compiler/testData/codegen/box/enum/annotatedParameter.kt");
}
@TestMetadata("annotatedParameter2.kt")
public void testAnnotatedParameter2() throws Exception {
runTest("compiler/testData/codegen/box/enum/annotatedParameter2.kt");
}
@TestMetadata("asReturnExpression.kt")
public void testAsReturnExpression() throws Exception {
runTest("compiler/testData/codegen/box/enum/asReturnExpression.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+10
View File
@@ -9598,6 +9598,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/enum"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("annotatedParameter.kt")
public void testAnnotatedParameter() throws Exception {
runTest("compiler/testData/codegen/box/enum/annotatedParameter.kt");
}
@TestMetadata("annotatedParameter2.kt")
public void testAnnotatedParameter2() throws Exception {
runTest("compiler/testData/codegen/box/enum/annotatedParameter2.kt");
}
@TestMetadata("asReturnExpression.kt")
public void testAsReturnExpression() throws Exception {
runTest("compiler/testData/codegen/box/enum/asReturnExpression.kt");
compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
Generated
+5
View File
@@ -462,6 +462,11 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
runTest("compiler/testData/writeFlags/function/constructors/classObject.kt");
}
@TestMetadata("enum.kt")
public void testEnum() throws Exception {
runTest("compiler/testData/writeFlags/function/constructors/enum.kt");
}
@TestMetadata("objectInClass.kt")
public void testObjectInClass() throws Exception {
runTest("compiler/testData/writeFlags/function/constructors/objectInClass.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -9598,6 +9598,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/enum"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM_IR, true);
}
@TestMetadata("annotatedParameter.kt")
public void testAnnotatedParameter() throws Exception {
runTest("compiler/testData/codegen/box/enum/annotatedParameter.kt");
}
@TestMetadata("annotatedParameter2.kt")
public void testAnnotatedParameter2() throws Exception {
runTest("compiler/testData/codegen/box/enum/annotatedParameter2.kt");
}
@TestMetadata("asReturnExpression.kt")
public void testAsReturnExpression() throws Exception {
runTest("compiler/testData/codegen/box/enum/asReturnExpression.kt");