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

[Reflection] Use reference equality to determine that a callable reference is bound

Browse Source 
It helps to avoid problems when receiver object implements structural equals violating the equality contract

#KT-60709
This commit is contained in:
Evgeniy.Zhelenskiy
2023-07-26 09:35:07 +02:00
committed by Space Team
parent 64f90f685d
commit 291d52820c
10 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -45162,6 +45162,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@Test
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@Test
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -45162,6 +45162,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@Test
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@Test
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -45162,6 +45162,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@Test
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@Test
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
compiler/testData/codegen/box/reflection/callBy/kt60709.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// TARGET_BACKEND: JVM
// WITH_REFLECT
class Eq {
override fun equals(other: Any?): Boolean = true
override fun toString(): String = "1"
val x: String get() = "2"
}
fun box(): String {
require(Eq()::toString.callBy(mapOf()) == "1")
require(Eq()::x.callBy(mapOf()) == "2")
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -42390,6 +42390,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@Test
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@Test
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -45162,6 +45162,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@Test
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@Test
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -45162,6 +45162,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@Test
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@Test
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -35884,6 +35884,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
}
@TestMetadata("kt60709.kt")
public void testKt60709() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt60709.kt");
}
@TestMetadata("kt61304.kt")
public void testKt61304() throws Exception {
runTest("compiler/testData/codegen/box/reflection/callBy/kt61304.kt");
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
+1 -1
View File
@@ -53,7 +53,7 @@ internal class KFunctionImpl private constructor(
descriptor
)
override val isBound: Boolean get() = rawBoundReceiver != CallableReference.NO_RECEIVER
override val isBound: Boolean get() = rawBoundReceiver !== CallableReference.NO_RECEIVER
override val descriptor: FunctionDescriptor by ReflectProperties.lazySoft(descriptorInitialValue) {
container.findFunctionDescriptor(name, signature)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+1 -1
View File
@@ -47,7 +47,7 @@ internal abstract class KPropertyImpl<out V> private constructor(
val boundReceiver
get() = rawBoundReceiver.coerceToExpectedReceiverType(descriptor)
override val isBound: Boolean get() = rawBoundReceiver != CallableReference.NO_RECEIVER
override val isBound: Boolean get() = rawBoundReceiver !== CallableReference.NO_RECEIVER
private val _javaField = lazy(PUBLICATION) {
when (val jvmSignature = RuntimeTypeMapper.mapPropertySignature(descriptor)) {