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

[FIR] Don't enhance Int and String Java final static fields

Browse Source 
It's effectively a breaking change (^KT-62558)

K2 assigns flexible type to all static fields (from Java) and, for example,
`String? becomes String unlike K1. It affects IR signature generating.
That's why signature dump is disabled for some tests.

^KT-57811 Fixed
^KT-61786 Fixed
This commit is contained in:
Ivan Kochurkin
2023-10-10 20:05:39 +02:00
committed by Space Team
parent 2d61b9a477
commit 498f2e534a
25 changed files with 82 additions and 71 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/DiagnosticCompilerTestFirTestdataTestGenerated.java
Generated
+6
View File
@@ -3435,6 +3435,12 @@ public class DiagnosticCompilerTestFirTestdataTestGenerated extends AbstractDiag
runTest("compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.kt");
}
@Test
@TestMetadata("noEnhancementOnFinalStaticConstFields.kt")
public void testNoEnhancementOnFinalStaticConstFields() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/inference/noEnhancementOnFinalStaticConstFields.kt");
}
@Test
@TestMetadata("nullableIntegerLiteralType.kt")
public void testNullableIntegerLiteralType() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
Generated
+6
View File
@@ -3435,6 +3435,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated
runTest("compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.kt");
}
@Test
@TestMetadata("noEnhancementOnFinalStaticConstFields.kt")
public void testNoEnhancementOnFinalStaticConstFields() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/inference/noEnhancementOnFinalStaticConstFields.kt");
}
@Test
@TestMetadata("nullableIntegerLiteralType.kt")
public void testNullableIntegerLiteralType() throws Exception {
compiler/fir/analysis-tests/testData/resolve/inference/noEnhancementOnFinalStaticConstFields.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
FILE: main.kt
public final fun test(x1: R|kotlin/String?|): R|kotlin/String| {
lval x: R|kotlin/String?|
R|<local>/x| = R|<local>/x1| ?: Q|JavaClass|.R|/JavaClass.X*s|
^test R|<local>/x|
}
compiler/fir/analysis-tests/testData/resolve/inference/noEnhancementOnFinalStaticConstFields.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// ISSUE: KT-57811, KT-61786
// FILE: JavaClass.java
public class JavaClass {
public static final String X = null;
}
// FILE: main.kt
fun test(x1: String?): String {
val x: String?
x = x1 ?: JavaClass.X
return x
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: main.kt
public final fun test(): R|kotlin/Unit| {
lval project: R|kotlin/String| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT*s|
lval project: R|kotlin/String!| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT*s|
lval member: R|kotlin/String!| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -3435,6 +3435,12 @@ public class FirLightTreeDiagnosticsTestGenerated extends AbstractFirLightTreeDi
runTest("compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.kt");
}
@Test
@TestMetadata("noEnhancementOnFinalStaticConstFields.kt")
public void testNoEnhancementOnFinalStaticConstFields() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/inference/noEnhancementOnFinalStaticConstFields.kt");
}
@Test
@TestMetadata("nullableIntegerLiteralType.kt")
public void testNullableIntegerLiteralType() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java
Generated
+6
View File
@@ -3435,6 +3435,12 @@ public class FirPsiDiagnosticTestGenerated extends AbstractFirPsiDiagnosticTest
runTest("compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.kt");
}
@Test
@TestMetadata("noEnhancementOnFinalStaticConstFields.kt")
public void testNoEnhancementOnFinalStaticConstFields() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/inference/noEnhancementOnFinalStaticConstFields.kt");
}
@Test
@TestMetadata("nullableIntegerLiteralType.kt")
public void testNullableIntegerLiteralType() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
+1 -1
View File
@@ -150,7 +150,7 @@ internal fun checkConstantArguments(
for (exp in expression.arguments.plus(expression.dispatchReceiver).plus(expression.extensionReceiver)) {
if (exp == null) continue
val expClassId = exp.resolvedType.fullyExpandedClassId(session)
val expClassId = exp.resolvedType.lowerBoundIfFlexible().fullyExpandedClassId(session)
// TODO, KT-59823: add annotation for allowed constant types
if (expClassId !in StandardClassIds.constantAllowedTypes) {
return ConstantArgumentKind.NOT_CONST
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+1 -8
View File
@@ -117,14 +117,7 @@ class FirSignatureEnhancement(
val newReturnTypeRef = enhanceReturnType(
firElement, emptyList(), firElement.computeDefaultQualifiers(),
predefinedEnhancementInfo = null
).let {
val lowerBound = it.type.lowerBoundIfFlexible()
if ((lowerBound.isString || lowerBound.isInt) && firElement.isStatic && firElement.initializer != null) {
it.withReplacedConeType(it.type.withNullability(ConeNullability.NOT_NULL, session.typeContext))
} else {
it
}
}
)
val symbol = FirFieldSymbol(original.callableId)
buildJavaField {
compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.fir.ir.txt
Vendored
+2 -1
View File
@@ -9,7 +9,8 @@ FILE fqName:<root> fileName:/Child.kt
$this: VALUE_PARAMETER name:<this> type:<root>.Child
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Child'
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=GET_PROPERTY
TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:@[FlexibleNullability] kotlin.String? visibility:public [final,static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in javapackage.PublicParentClass
compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/test.kt:(154,158): error: Overload resolution ambiguity between candidates: [static field SOME: String, static enum entry SOME: SomeEnum]
/test.kt:(154,158): error: Overload resolution ambiguity between candidates: [static field SOME: String!, static enum entry SOME: SomeEnum]
compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/test.kt:(160,164): error: Overload resolution ambiguity between candidates: [static field SOME: String, static enum entry SOME: SomeEnum]
/test.kt:(160,164): error: Overload resolution ambiguity between candidates: [static field SOME: String!, static enum entry SOME: SomeEnum]
compiler/testData/diagnostics/tests/modifiers/const/kotlinJavaCycle.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// IGNORE_CONTRACT_VIOLATIONS
// FIR_IDENTICAL
// FILE: Bar.java
compiler/testData/diagnostics/tests/modifiers/const/kt12248.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// IGNORE_CONTRACT_VIOLATIONS
// FIR_IDENTICAL
// FILE: Bar.java
compiler/testData/diagnostics/tests/visibility/packagePrivateStaticInterfaceFieldViaKotlinClass.fir.txt
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ FILE: Child.kt
}
public final fun foo(): R|kotlin/Unit| {
lval x: R|kotlin/String| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
lval y: R|kotlin/String| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
lval x: R|kotlin/String!| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
lval y: R|kotlin/String!| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
lval z: <ERROR TYPE REF: Unresolved name: publicStaticField> = Q|javapackage/KotlinParentClass|.<Unresolved name: publicStaticField>#
}
compiler/testData/ir/irText/declarations/kt29833.fir.ir.txt
Vendored
+9 -9
View File
@@ -6,26 +6,26 @@ FILE fqName:interop fileName:/Definitions.kt
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Definitions modality:FINAL visibility:public superTypes:[kotlin.Any]'
PROPERTY name:KT_CONSTANT visibility:public modality:FINAL [const,val]
FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:kotlin.String visibility:public [final]
FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:@[FlexibleNullability] kotlin.String? visibility:public [final]
EXPRESSION_BODY
CONST String type=kotlin.String value="constant"
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-KT_CONSTANT> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-KT_CONSTANT> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:@[FlexibleNullability] kotlin.String?
correspondingProperty: PROPERTY name:KT_CONSTANT visibility:public modality:FINAL [const,val]
$this: VALUE_PARAMETER name:<this> type:interop.Definitions
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-KT_CONSTANT> (): kotlin.String declared in interop.Definitions'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:kotlin.String visibility:public [final]' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun <get-KT_CONSTANT> (): @[FlexibleNullability] kotlin.String? declared in interop.Definitions'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:@[FlexibleNullability] kotlin.String? visibility:public [final]' type=@[FlexibleNullability] kotlin.String? origin=null
receiver: GET_VAR '<this>: interop.Definitions declared in interop.Definitions.<get-KT_CONSTANT>' type=interop.Definitions origin=null
PROPERTY name:ktValue visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:private [final]
FIELD PROPERTY_BACKING_FIELD name:ktValue type:@[FlexibleNullability] kotlin.String? visibility:private [final]
EXPRESSION_BODY
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=GET_PROPERTY
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ktValue> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:@[FlexibleNullability] kotlin.String? visibility:public [final,static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ktValue> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:@[FlexibleNullability] kotlin.String?
correspondingProperty: PROPERTY name:ktValue visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:interop.Definitions
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-ktValue> (): kotlin.String declared in interop.Definitions'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun <get-ktValue> (): @[FlexibleNullability] kotlin.String? declared in interop.Definitions'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ktValue type:@[FlexibleNullability] kotlin.String? visibility:private [final]' type=@[FlexibleNullability] kotlin.String? origin=null
receiver: GET_VAR '<this>: interop.Definitions declared in interop.Definitions.<get-ktValue>' type=interop.Definitions origin=null
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
compiler/testData/ir/irText/declarations/kt29833.fir.kt.txt
Vendored
+2 -2
View File
@@ -7,11 +7,11 @@ object Definitions {
}
const val KT_CONSTANT: String
const val KT_CONSTANT: @FlexibleNullability String?
field = "constant"
get
val ktValue: String
val ktValue: @FlexibleNullability String?
field = #CONSTANT
get
compiler/testData/ir/irText/declarations/kt29833.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// SKIP_SIGNATURE_DUMP
// TARGET_BACKEND: JVM
// FILE: Definitions.kt
// IR_FILE: kt29833.txt
compiler/testData/ir/irText/declarations/kt29833.sig.kt.txt
Vendored
-36
View File
@@ -1,36 +0,0 @@
package interop
// CHECK:
// Mangled name: interop.Definitions
// Public signature: interop/Definitions|null[0]
object Definitions {
// CHECK:
// Mangled name: interop.Definitions{}ktValue
// Public signature: interop/Definitions.ktValue|-7932704459611172354[0]
// Public signature debug description: {}ktValue
val ktValue: String
// CHECK JVM_IR:
// Mangled name: interop.Definitions#<get-ktValue>(){}kotlin.String
// Public signature: interop/Definitions.ktValue.<get-ktValue>|233367925131846588[0]
// Public signature debug description: <get-ktValue>(){}kotlin.String
get
// CHECK:
// Mangled name: interop.Definitions#<init>(){}
// Public signature: interop/Definitions.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
private constructor() /* primary */
// CHECK:
// Mangled name: interop.Definitions{}KT_CONSTANT
// Public signature: interop/Definitions.KT_CONSTANT|-8714407162660026641[0]
// Public signature debug description: {}KT_CONSTANT
const val KT_CONSTANT: String
// CHECK JVM_IR:
// Mangled name: interop.Definitions#<get-KT_CONSTANT>(){}kotlin.String
// Public signature: interop/Definitions.KT_CONSTANT.<get-KT_CONSTANT>|4728854297559730352[0]
// Public signature debug description: <get-KT_CONSTANT>(){}kotlin.String
get
}
compiler/testData/ir/irText/firProblems/SameJavaFieldReferences.fir.ir.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
FILE fqName:<root> fileName:/SameJavaFieldReferences.kt
FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit
BLOCK_BODY
VAR name:ref1 type:kotlin.reflect.KProperty0<@[FlexibleNullability] kotlin.String?> [val]
PROPERTY_REFERENCE 'public final someJavaField: @[FlexibleNullability] kotlin.String?' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:someJavaField type:@[FlexibleNullability] kotlin.String? visibility:public [final,static]' getter=null setter=null type=kotlin.reflect.KProperty0<@[FlexibleNullability] kotlin.String?> origin=null
VAR name:ref2 type:kotlin.reflect.KProperty0<@[FlexibleNullability] kotlin.String?> [val]
PROPERTY_REFERENCE 'public final someJavaField: @[FlexibleNullability] kotlin.String?' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:someJavaField type:@[FlexibleNullability] kotlin.String? visibility:public [final,static]' getter=null setter=null type=kotlin.reflect.KProperty0<@[FlexibleNullability] kotlin.String?> origin=null
compiler/testData/ir/irText/firProblems/SameJavaFieldReferences.fir.kt.txt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun foo() {
val ref1: KProperty0<@FlexibleNullability String?> = SomeJavaClass::someJavaField
val ref2: KProperty0<@FlexibleNullability String?> = SomeJavaClass::someJavaField
}
compiler/testData/ir/irText/firProblems/SameJavaFieldReferences.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM
// FIR_IDENTICAL
// FILE: SomeJavaClass.java
public class SomeJavaClass {
compiler/testData/ir/irText/firProblems/SameJavaFieldReferences.kt.txt
Vendored
+1
View File
@@ -2,3 +2,4 @@ fun foo() {
val ref1: KProperty0<String> = SomeJavaClass::someJavaField
val ref2: KProperty0<String> = SomeJavaClass::someJavaField
}
compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public abstract interface StringConstantInParam : R|kotlin/Any| {
public final static field HEL: R|kotlin/String| = String(hel)
public final static field HEL: R|kotlin/String!| = String(hel)
public final annotation class Anno : R|kotlin/Annotation| {
public constructor(value: R|kotlin/String|): R|test/StringConstantInParam.Anno|
compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
Vendored
+3 -3
View File
@@ -1,13 +1,13 @@
public open class StaticFinal : R|kotlin/Any| {
public final static field publicNonNull: R|kotlin/String| = String(aaa)
public final static field publicNonNull: R|kotlin/String!| = String(aaa)
public final static field publicNull: R|kotlin/String!|
public/*package*/ final static field packageNonNull: R|kotlin/String| = String(bbb)
public/*package*/ final static field packageNonNull: R|kotlin/String!| = String(bbb)
public/*package*/ final static field packageNull: R|kotlin/String!|
private final static field privateNonNull: R|kotlin/String| = String(bbb)
private final static field privateNonNull: R|kotlin/String!| = String(bbb)
private final static field privateNull: R|kotlin/String!|