[FIR] KT-57835: Prevent the compiler crash
^KT-57835 Fixed
diff --git a/compiler/fir/fir-serialization/build.gradle.kts b/compiler/fir/fir-serialization/build.gradle.kts
index 6d77688..94bbcfb 100644
--- a/compiler/fir/fir-serialization/build.gradle.kts
+++ b/compiler/fir/fir-serialization/build.gradle.kts
@@ -12,6 +12,7 @@
api(project(":compiler:fir:cones"))
api(project(":compiler:fir:tree"))
+ api(project(":compiler:fir:java"))
api(project(":compiler:fir:providers"))
api(project(":compiler:fir:semantics"))
api(project(":compiler:fir:resolve"))
diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt
index 8ced628..6eb3048 100644
--- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt
+++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt
@@ -9,9 +9,11 @@
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.declarations.FirEnumEntry
import org.jetbrains.kotlin.fir.declarations.utils.isConst
+import org.jetbrains.kotlin.fir.declarations.utils.isFinal
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationArgumentMapping
import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall
+import org.jetbrains.kotlin.fir.java.declarations.FirJavaField
import org.jetbrains.kotlin.fir.references.builder.buildSimpleNamedReference
import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirArrayOfCallTransformer
@@ -109,6 +111,7 @@
data: FirSession
): ConstantValue<*>? {
val symbol = qualifiedAccessExpression.toResolvedCallableSymbol() ?: return null
+ val fir = symbol.fir
return when {
symbol.fir is FirEnumEntry -> {
@@ -120,6 +123,14 @@
if (symbol.fir.isConst) symbol.fir.initializer?.accept(this, data) else null
}
+ fir is FirJavaField -> {
+ if (fir.isFinal) {
+ fir.initializer?.accept(this, data)
+ } else {
+ null
+ }
+ }
+
symbol is FirConstructorSymbol -> {
val constructorCall = qualifiedAccessExpression as FirFunctionCall
val constructedClassSymbol = symbol.containingClassLookupTag()?.toFirRegularClassSymbol(data) ?: return null
@@ -232,12 +243,15 @@
override fun visitQualifiedAccessExpression(qualifiedAccessExpression: FirQualifiedAccessExpression, data: FirSession): Boolean {
val symbol = qualifiedAccessExpression.toResolvedCallableSymbol() ?: return false
+ val fir = symbol.fir
return when {
symbol.fir is FirEnumEntry -> symbol.fir.returnTypeRef.coneTypeSafe<ConeClassLikeType>()?.classId != null
symbol is FirPropertySymbol -> symbol.fir.isConst
+ fir is FirJavaField -> symbol.fir.isFinal
+
symbol is FirConstructorSymbol -> {
symbol.containingClassLookupTag()?.toFirRegularClassSymbol(data)?.classKind == ClassKind.ANNOTATION_CLASS
}
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
index 935e319..1c59f72 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
@@ -216,6 +216,12 @@
}
@Test
+ @TestMetadata("javaConstAnnotationArguments.kt")
+ public void testJavaConstAnnotationArguments() throws Exception {
+ runTest("compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt");
+ }
+
+ @Test
@TestMetadata("javaNegativePropertyAsAnnotationParameter.kt")
public void testJavaNegativePropertyAsAnnotationParameter() throws Exception {
runTest("compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt");
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
index 63b0394..bdc6ce2 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
@@ -216,6 +216,12 @@
}
@Test
+ @TestMetadata("javaConstAnnotationArguments.kt")
+ public void testJavaConstAnnotationArguments() throws Exception {
+ runTest("compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt");
+ }
+
+ @Test
@TestMetadata("javaNegativePropertyAsAnnotationParameter.kt")
public void testJavaNegativePropertyAsAnnotationParameter() throws Exception {
runTest("compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt");
diff --git a/compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt b/compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt
new file mode 100644
index 0000000..fb881d8
--- /dev/null
+++ b/compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt
@@ -0,0 +1,18 @@
+// FIR_IDENTICAL
+// ISSUE: KT-57879
+// TARGET_BACKEND: JVM_IR
+
+// FILE: CoreBundle.java
+
+public class CoreBundle {
+ public static final String BUNDLE = "OK";
+}
+
+// FILE: main.kt
+
+@Target(AnnotationTarget.TYPE)
+annotation class AnnKlass(val argument: String)
+
+fun message(key: @AnnKlass(CoreBundle.BUNDLE) String) = key
+
+fun box() = message("OK")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index b9308aa..cf9613c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -216,6 +216,12 @@
}
@Test
+ @TestMetadata("javaConstAnnotationArguments.kt")
+ public void testJavaConstAnnotationArguments() throws Exception {
+ runTest("compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt");
+ }
+
+ @Test
@TestMetadata("javaNegativePropertyAsAnnotationParameter.kt")
public void testJavaNegativePropertyAsAnnotationParameter() throws Exception {
runTest("compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt");
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
index 153358a..b1d044d 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
@@ -216,6 +216,12 @@
}
@Test
+ @TestMetadata("javaConstAnnotationArguments.kt")
+ public void testJavaConstAnnotationArguments() throws Exception {
+ runTest("compiler/testData/codegen/box/annotations/javaConstAnnotationArguments.kt");
+ }
+
+ @Test
@TestMetadata("javaNegativePropertyAsAnnotationParameter.kt")
public void testJavaNegativePropertyAsAnnotationParameter() throws Exception {
runTest("compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt");
