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

[FIR] Do not enhance nullability for annotation interface field types.

Browse Source 
Java annotation interface fields are constant declarations that can
have any Java type and are not restricted in the same way that
method return types are for annotation interfaces.

#KT-65482 Fixed
This commit is contained in:
Mads Ager
2024-02-02 12:11:03 +01:00
committed by Space Team
parent f5d0a5b92d
commit 79eee6de4f
12 changed files with 99 additions and 3 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
@@ -31262,6 +31262,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() 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
@@ -31262,6 +31262,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -30931,6 +30931,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -30931,6 +30931,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -30931,6 +30931,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+12 -3
View File
@@ -632,10 +632,19 @@ class FirSignatureEnhancement(
defaultQualifiers: JavaTypeQualifiersByElementType?,
predefinedEnhancementInfo: PredefinedFunctionEnhancementInfo?
): FirResolvedTypeRef {
val containerApplicabilityType = if (owner is FirJavaField)
val containerApplicabilityType = if (owner is FirJavaField) {
AnnotationQualifierApplicabilityType.FIELD
else
} else {
AnnotationQualifierApplicabilityType.METHOD_RETURN_TYPE
}
val forAnnotationMember = if (owner is FirJavaField) {
// Fields in annotation interfaces are constant declarations that can have any Java type.
// For example: public @interface MyApi { Integer field = -1; }
// Therefore, for such annotation interface fields, we use default Java type enhancement.
false
} else {
this.owner.classKind == ClassKind.ANNOTATION_CLASS
}
return owner.enhance(
overriddenMembers,
owner,
@@ -644,7 +653,7 @@ class FirSignatureEnhancement(
containerApplicabilityType,
TypeInSignature.Return,
predefinedEnhancementInfo?.returnTypeInfo,
forAnnotationMember = this.owner.classKind == ClassKind.ANNOTATION_CLASS
forAnnotationMember = forAnnotationMember
)
}
compiler/testData/codegen/box/javaInterop/kt65482.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM
// FILE: MyApi.java
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.CLASS)
@Target({
ElementType.FIELD,
ElementType.METHOD,
ElementType.TYPE,
ElementType.CONSTRUCTOR,
ElementType.PACKAGE
})
public @interface MyApi {
Integer LATEST = -1;
long value();
}
// FILE: main.kt
fun box(): String {
if (-1 == MyApi.LATEST) return "OK"
return "NOT OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -30931,6 +30931,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -29119,6 +29119,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -30931,6 +30931,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -30931,6 +30931,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@Test
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@Test
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -26207,6 +26207,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/javaInterop/kt48590.kt");
}
@TestMetadata("kt65482.kt")
public void testKt65482() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/kt65482.kt");
}
@TestMetadata("lambdaInstanceOf.kt")
public void testLambdaInstanceOf() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");