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

Fir2Ir: build fake overrides for abstract methods from Any

Browse Source 
This call to isAbstractMethodOfAny was in Fir2IrLazyClass since its
inception in 0622be14a5, and there's no explanation why this was
necessary. Removing it does not seem to break anything, but fixes the
case when IrFakeOverrideRebuilder is enabled and when Java base class
declares an abstract equals/hashCode/toString which is not overridden in
the Kotlin subclass.

 #KT-63443 Fixed
This commit is contained in:
Alexander Udalov
2023-11-24 12:43:37 +01:00
committed by Space Team
parent b63a780e15
commit daac8603d0
11 changed files with 116 additions and 7 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
@@ -30529,6 +30529,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, true);
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -30529,6 +30529,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, true);
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt
-7
View File
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.isSubstitutionOrIntersectionOverride
import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
import org.jetbrains.kotlin.fir.scopes.processClassifiersByName
import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.declarations.*
@@ -197,7 +196,6 @@ class Fir2IrLazyClass(
symbol.isSubstitutionOrIntersectionOverride -> {}
!shouldBuildStub(symbol.fir) -> {}
symbol.containingClassLookupTag() != ownerLookupTag -> {}
symbol.isAbstractMethodOfAny() -> {}
else -> {
// Lazy declarations are created together with their symbol, so it's safe to take the owner here
@OptIn(UnsafeDuringIrConstructionAPI::class)
@@ -260,11 +258,6 @@ class Fir2IrLazyClass(
override val isNewPlaceForBodyGeneration: Boolean
get() = fir.isNewPlaceForBodyGeneration == true
private fun FirNamedFunctionSymbol.isAbstractMethodOfAny(): Boolean {
if (modality != Modality.ABSTRACT) return false
return isMethodOfAny
}
private var irLoaded: Boolean? = null
override fun loadIr(): Boolean {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -30134,6 +30134,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -30134,6 +30134,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -30134,6 +30134,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt
Vendored
+63
View File
@@ -0,0 +1,63 @@
// TARGET_BACKEND: JVM
// FILE: JI.java
public interface JI {
@Override
public abstract boolean equals(Object o);
@Override
public abstract int hashCode();
@Override
public abstract String toString();
}
// FILE: JC.java
public abstract class JC {
@Override
public abstract boolean equals(Object o);
@Override
public abstract int hashCode();
@Override
public abstract String toString();
}
// FILE: JC2.java
public abstract class JC2 extends JC {
}
// FILE: box.kt
interface KI : JI
class X : KI {
override fun equals(other: Any?): Boolean = true
override fun hashCode(): Int = 0
override fun toString(): String = ""
}
abstract class KC : JC()
class Y : KC() {
override fun equals(other: Any?): Boolean = true
override fun hashCode(): Int = 0
override fun toString(): String = ""
}
abstract class KC2 : JC2()
class Z : KC2() {
override fun equals(other: Any?): Boolean = true
override fun hashCode(): Int = 0
override fun toString(): String = ""
}
fun box(): String {
X().equals(X())
X().hashCode()
X().toString()
Y().equals(Y())
Y().hashCode()
Y().toString()
Z().equals(Z())
Z().hashCode()
Z().toString()
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -28436,6 +28436,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -30134,6 +30134,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -30134,6 +30134,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
@TestMetadata("compiler/testData/codegen/box/javaInterop")
@TestDataPath("$PROJECT_ROOT")
public class JavaInterop {
@Test
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
@Test
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -25501,6 +25501,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
@TestMetadata("abstractMethodsOfAny.kt")
public void testAbstractMethodsOfAny() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/abstractMethodsOfAny.kt");
}
public void testAllFilesPresentInJavaInterop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}