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

JVM IR: transform fake override properties in SAM adapters

Browse Source 
Replace every property with its getter and setter. This is needed
because later on, JVM backend assumes that all properties have been
lowered (by JvmPropertiesLowering) to this state.

 #KT-64116 Fixed
This commit is contained in:
Alexander Udalov
2024-01-02 15:32:07 +01:00
committed by Space Team
parent d5b59c48c2
commit d08c9ba222
24 changed files with 167 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -50854,6 +50854,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -50854,6 +50854,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -50319,6 +50319,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -50319,6 +50319,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -50319,6 +50319,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt
+4
View File
@@ -79,6 +79,8 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) :
open val inInlineFunctionScope get() = allScopes.any { scope -> (scope.irElement as? IrFunction)?.isInline ?: false }
protected open fun postprocessCreatedObjectProxy(klass: IrClass) {}
override fun lower(irFile: IrFile) {
cachedImplementations.clear()
inlineCachedImplementations.clear()
@@ -248,6 +250,8 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) :
ignoredParentSymbols = listOf(transformedSuperMethod.symbol)
)
postprocessCreatedObjectProxy(subclass)
return subclass
}
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt
+11 -4
View File
@@ -18,14 +18,12 @@ import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.builders.declarations.IrFunctionBuilder
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.IrTypeOperatorCall
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.types.getClass
import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
import org.jetbrains.kotlin.utils.filterIsInstanceAnd
internal val singleAbstractMethodPhase = makeIrFilePhase(
::JvmSingleAbstractMethodLowering,
@@ -67,4 +65,13 @@ private class JvmSingleAbstractMethodLowering(context: JvmBackendContext) : Sing
override val IrType.needEqualsHashCodeMethods
get() = isKotlinFunInterface || isJavaSamConversionWithEqualsHashCode
override fun postprocessCreatedObjectProxy(klass: IrClass) {
val fakeOverrideProperties = klass.declarations.filterIsInstanceAnd(IrProperty::isFakeOverride)
klass.declarations.removeAll(fakeOverrideProperties)
for (property in fakeOverrideProperties) {
property.getter?.let(klass.declarations::add)
property.setter?.let(klass.declarations::add)
}
}
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
+5 -6
View File
@@ -1311,12 +1311,11 @@ fun IrClass.addFakeOverrides(
implementedMembers: List<IrOverridableMember> = emptyList(),
ignoredParentSymbols: List<IrSymbol> = emptyList()
) {
IrFakeOverrideBuilder(typeSystem, BindToNewEmptySymbols, emptyList())
.buildFakeOverridesForClassUsingOverriddenSymbols(this,
implementedMembers = implementedMembers,
compatibilityMode = false,
ignoredParentSymbols = ignoredParentSymbols)
.forEach { addChild(it) }
val fakeOverrides = IrFakeOverrideBuilder(typeSystem, BindToNewEmptySymbols, emptyList())
.buildFakeOverridesForClassUsingOverriddenSymbols(this, implementedMembers, compatibilityMode = false, ignoredParentSymbols)
for (fakeOverride in fakeOverrides) {
addChild(fakeOverride)
}
}
fun IrFactory.createStaticFunctionWithReceivers(
compiler/testData/codegen/box/sam/kt64116.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// MODULE: lib
// FILE: JsPrimitives.kt
package lib
interface JsObject {
val isString: Boolean
get() = false
}
fun interface JsRunnable : JsObject {
fun run()
}
// MODULE: main(lib)
// FILE: main.kt
import lib.JsRunnable
class ReactComponent {
fun forceUpdate(callback: JsRunnable) { callback.run() }
}
fun forceUpdate(myNativeComponent: ReactComponent, callback: () -> Unit) {
myNativeComponent.forceUpdate(callback)
}
fun box(): String {
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -49659,6 +49659,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -46725,6 +46725,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -49659,6 +49659,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -49659,6 +49659,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Test
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -39856,6 +39856,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@TestMetadata("noConversionFromSamToSam.kt")
public void testNoConversionFromSamToSam() throws Exception {
runTest("compiler/testData/codegen/box/sam/noConversionFromSamToSam.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -35217,6 +35217,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -35217,6 +35217,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -34665,6 +34665,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -34665,6 +34665,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -38966,6 +38966,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -39946,6 +39946,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -37422,6 +37422,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -38391,6 +38391,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -35091,6 +35091,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -34539,6 +34539,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
runTest("compiler/testData/codegen/box/sam/kt63564.kt");
}
@Test
@TestMetadata("kt64116.kt")
public void testKt64116() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt64116.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/sam/adapters")
@TestDataPath("$PROJECT_ROOT")