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

KT-28054: Treat inline class constructor accessors specially

Browse Source
This commit is contained in:
Dmitry Petrov
2018-11-16 14:14:24 +03:00
parent 3a93cab3b6
commit 90da274eaa
11 changed files with 94 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+4 -1
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.codegen.coroutines.SuspendFunctionGenerationStrategy
import org.jetbrains.kotlin.codegen.coroutines.SuspendInlineFunctionGenerationStrategy;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
import org.jetbrains.kotlin.codegen.state.TypeMapperUtilsKt;
import org.jetbrains.kotlin.config.JvmDefaultMode;
import org.jetbrains.kotlin.config.JvmTarget;
import org.jetbrains.kotlin.config.LanguageFeature;
@@ -189,7 +190,9 @@ public class FunctionCodegen {
@NotNull MethodContext methodContext,
@NotNull FunctionGenerationStrategy strategy
) {
OwnerKind contextKind = methodContext.getContextKind();
OwnerKind contextKind = TypeMapperUtilsKt.isInlineClassConstructorAccessor(functionDescriptor)
? OwnerKind.ERASED_INLINE_CLASS
: methodContext.getContextKind();
DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
if (isInterface(containingDeclaration) &&
!processInterfaceMethod(functionDescriptor, contextKind, false, false, state.getJvmDefaultMode())) {
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+4 -1
View File
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.codegen.inline.ReifiedTypeParametersUsages;
import org.jetbrains.kotlin.codegen.inline.SourceMapper;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
import org.jetbrains.kotlin.codegen.state.TypeMapperUtilsKt;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.AnnotatedImpl;
import org.jetbrains.kotlin.descriptors.annotations.Annotations;
@@ -873,7 +874,9 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
functionDescriptor,
accessorDescriptor instanceof AccessorForCallableDescriptor &&
(((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallTarget() != null ||
((AccessorForCallableDescriptor) accessorDescriptor).getAccessorKind() == AccessorKind.JVM_DEFAULT_COMPATIBILITY)
((AccessorForCallableDescriptor) accessorDescriptor).getAccessorKind() == AccessorKind.JVM_DEFAULT_COMPATIBILITY),
(accessorDescriptor != null && TypeMapperUtilsKt.isInlineClassConstructorAccessor(accessorDescriptor)
? OwnerKind.ERASED_INLINE_CLASS : null)
);
boolean isJvmStaticInObjectOrClass = CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(functionDescriptor);
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+3 -1
View File
@@ -862,7 +862,9 @@ public class KotlinTypeMapper {
}
}
else {
boolean toInlinedErasedClass = currentOwner.isInline() && !isAccessor(functionDescriptor);
boolean toInlinedErasedClass =
currentOwner.isInline() &&
(!isAccessor(functionDescriptor) || TypeMapperUtilsKt.isInlineClassConstructorAccessor(functionDescriptor));
if (toInlinedErasedClass) {
functionDescriptor = descriptor;
}
compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMapperUtils.kt
+7 -1
View File
@@ -16,8 +16,10 @@
package org.jetbrains.kotlin.codegen.state
import org.jetbrains.kotlin.codegen.AccessorForConstructorDescriptor
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl
import org.jetbrains.kotlin.name.Name
@@ -86,4 +88,8 @@ fun CallableMemberDescriptor.createTypeParameterWithNewName(
fun KotlinType.removeExternalProjections(): KotlinType {
val newArguments = arguments.map { TypeProjectionImpl(Variance.INVARIANT, it.type) }
return replace(newArguments)
}
}
fun isInlineClassConstructorAccessor(descriptor: FunctionDescriptor): Boolean =
descriptor is AccessorForConstructorDescriptor &&
descriptor.calleeDescriptor.constructedClass.isInline
compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Composed(val s: String) {
private constructor(s1: String, s2: String) : this(s1 + s2)
companion object {
fun p1(s: String) = Composed("O", s)
}
}
fun box() = Composed.p1("K").s
compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Composed(val s: String) {
constructor(s: String, x: Int) : this(s.subSequence(0, x).toString())
private constructor(s1: String, s2: String) : this(s1 + s2, 2)
fun p1(s2: String) =
{ Composed(s, s2) }
}
fun box() = Composed("O").p1("K1234")().s
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -12351,6 +12351,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod2.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromCompanion.kt")
public void testAccessPrivateInlineClassConstructorFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromLambda.kt")
public void testAccessPrivateInlineClassConstructorFromLambda() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt");
}
@TestMetadata("accessPrivateInlineClassMethodFromCompanion.kt")
public void testAccessPrivateInlineClassMethodFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+10
View File
@@ -12351,6 +12351,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod2.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromCompanion.kt")
public void testAccessPrivateInlineClassConstructorFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromLambda.kt")
public void testAccessPrivateInlineClassConstructorFromLambda() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt");
}
@TestMetadata("accessPrivateInlineClassMethodFromCompanion.kt")
public void testAccessPrivateInlineClassMethodFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -12356,6 +12356,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod2.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromCompanion.kt")
public void testAccessPrivateInlineClassConstructorFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromLambda.kt")
public void testAccessPrivateInlineClassConstructorFromLambda() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt");
}
@TestMetadata("accessPrivateInlineClassMethodFromCompanion.kt")
public void testAccessPrivateInlineClassMethodFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+10
View File
@@ -10731,6 +10731,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod2.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromCompanion.kt")
public void testAccessPrivateInlineClassConstructorFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromLambda.kt")
public void testAccessPrivateInlineClassConstructorFromLambda() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt");
}
@TestMetadata("accessPrivateInlineClassMethodFromCompanion.kt")
public void testAccessPrivateInlineClassMethodFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+10
View File
@@ -11786,6 +11786,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod2.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromCompanion.kt")
public void testAccessPrivateInlineClassConstructorFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt");
}
@TestMetadata("accessPrivateInlineClassConstructorFromLambda.kt")
public void testAccessPrivateInlineClassConstructorFromLambda() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt");
}
@TestMetadata("accessPrivateInlineClassMethodFromCompanion.kt")
public void testAccessPrivateInlineClassMethodFromCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion.kt");