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

[FIR] Don't update explicit delegated constructor calls of classes with @JvmRecord

Browse Source 
^KT-54573 Fixed
This commit is contained in:
Dmitriy Novozhilov
2022-12-06 12:39:57 +02:00
committed by Space Team
parent 880b278c40
commit d898e256ca
9 changed files with 69 additions and 0 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/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -32309,6 +32309,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt");
}
@Test
@TestMetadata("explicitSuperConstructorCall.kt")
public void testExplicitSuperConstructorCall() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/explicitSuperConstructorCall.kt");
}
@Test
@TestMetadata("irrelevantFields.kt")
public void testIrrelevantFields() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -32405,6 +32405,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt");
}
@Test
@TestMetadata("explicitSuperConstructorCall.kt")
public void testExplicitSuperConstructorCall() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/explicitSuperConstructorCall.kt");
}
@Test
@TestMetadata("irrelevantFields.kt")
public void testIrrelevantFields() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -32309,6 +32309,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt");
}
@Test
@TestMetadata("explicitSuperConstructorCall.kt")
public void testExplicitSuperConstructorCall() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/explicitSuperConstructorCall.kt");
}
@Test
@TestMetadata("irrelevantFields.kt")
public void testIrrelevantFields() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxModernJdkCodegenTestGenerated.java
Generated
+6
View File
@@ -364,6 +364,12 @@ public class FirBlackBoxModernJdkCodegenTestGenerated extends AbstractFirBlackBo
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/jvmRecordBinary.kt");
}
@Test
@TestMetadata("kt54573.kt")
public void testKt54573() throws Exception {
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/kt54573.kt");
}
@Test
@TestMetadata("propertiesOverrides.kt")
public void testPropertiesOverrides() throws Exception {
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JvmSupertypeUpdater.kt
+10
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.java
import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.FirSession
@@ -15,6 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.hasAnnotationSafe
import org.jetbrains.kotlin.fir.declarations.utils.isData
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
import org.jetbrains.kotlin.fir.expressions.FirStatement
import org.jetbrains.kotlin.fir.expressions.impl.FirLazyDelegatedConstructorCall
import org.jetbrains.kotlin.fir.java.JvmSupertypeUpdater.DelegatedConstructorCallTransformer.Companion.recordType
import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
import org.jetbrains.kotlin.fir.resolve.ScopeSession
@@ -80,6 +82,14 @@ class JvmSupertypeUpdater(private val session: FirSession) : PlatformSupertypeUp
delegatedConstructorCall: FirDelegatedConstructorCall,
data: ScopeSession
): FirStatement {
/*
* Here we need to update only implicit calls to Any()
* And such calls don't have a real source and can not be an lazy calls
*/
if (
delegatedConstructorCall is FirLazyDelegatedConstructorCall ||
delegatedConstructorCall.source?.kind != KtFakeSourceElementKind.DelegatingConstructorCall
) return delegatedConstructorCall
val constructedTypeRef = delegatedConstructorCall.constructedTypeRef
if (constructedTypeRef is FirImplicitTypeRef || constructedTypeRef.coneTypeSafe<ConeKotlinType>()?.isAny == true) {
delegatedConstructorCall.replaceConstructedTypeRef(constructedTypeRef.resolvedTypeFromPrototype(recordType))
compiler/testData/codegen/boxModernJdk/testsWithJava17/records/kt54573.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// TARGET_BACKEND: JVM_IR
// ISSUE: KT-54573
// WITH_STDLIB
@JvmRecord
data class A constructor(val x: Int, val s: String) {
constructor(s: String) : this(s.length, s)
}
fun box(): String = A("OK").s
compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/explicitSuperConstructorCall.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// FIR_IDENTICAL
// SKIP_TXT
// ISSUE: KT-54573
// JVM_TARGET: 17
@JvmRecord
data class A constructor(val x: Int, val s: String) {
constructor(x: Long, s: String) : <!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>super<!>(<!TOO_MANY_ARGUMENTS!>x.toInt()<!>, <!TOO_MANY_ARGUMENTS!>s<!>)
constructor(x: Byte, s: String) : <!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>super<!>(<!TOO_MANY_ARGUMENTS!>x.toInt()<!>, <!TOO_MANY_ARGUMENTS!>s.<!UNRESOLVED_REFERENCE!>unresolved<!>()<!>)
constructor(s: String) : this(s.length, s)
constructor(s: CharSequence) : this(s.length, s.<!UNRESOLVED_REFERENCE!>unresolved<!>())
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -32405,6 +32405,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt");
}
@Test
@TestMetadata("explicitSuperConstructorCall.kt")
public void testExplicitSuperConstructorCall() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/explicitSuperConstructorCall.kt");
}
@Test
@TestMetadata("irrelevantFields.kt")
public void testIrrelevantFields() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java
Generated
+6
View File
@@ -364,6 +364,12 @@ public class IrBlackBoxModernJdkCodegenTestGenerated extends AbstractIrBlackBoxC
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/jvmRecordBinary.kt");
}
@Test
@TestMetadata("kt54573.kt")
public void testKt54573() throws Exception {
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/kt54573.kt");
}
@Test
@TestMetadata("propertiesOverrides.kt")
public void testPropertiesOverrides() throws Exception {