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

[FIR] Enhance getter overrides based on overridden properties

Browse Source 
The following tests are failing with exceptions and will be fixed in the
following commits

j+k/testKjkPropertyAndExtensionProperty.kt
j+k/testKjkImplicitReturnType.kt

#KT-62118 Fixed
This commit is contained in:
Kirill Rakhman
2024-02-28 10:41:14 +01:00
committed by Space Team
parent 885ba11d97
commit 973e337bf5
42 changed files with 1140 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.ir.txt
Vendored
+18 -18
View File
@@ -129,19 +129,19 @@ FILE fqName:<root> fileName:/1.kt
$this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>
PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val]
overridden:
public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>?
FUN FAKE_OVERRIDE name:<get-entries> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>? [fake_override]
public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>>
FUN FAKE_OVERRIDE name:<get-entries> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>> [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-entries> (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>? declared in <root>.Java1
public open fun <get-entries> (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>> declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val]
overridden:
public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>?
FUN FAKE_OVERRIDE name:<get-keys> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>? [fake_override]
public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>
FUN FAKE_OVERRIDE name:<get-keys> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-keys> (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>? declared in <root>.Java1
public open fun <get-keys> (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
overridden:
@@ -153,11 +153,11 @@ FILE fqName:<root> fileName:/1.kt
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val]
overridden:
public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>?
FUN FAKE_OVERRIDE name:<get-values> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>? [fake_override]
public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>
FUN FAKE_OVERRIDE name:<get-values> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-values> (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>? declared in <root>.Java1
public open fun <get-values> (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
CLASS CLASS name:B modality:FINAL visibility:public superTypes:[<root>.Java1]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
@@ -311,27 +311,27 @@ FILE fqName:<root> fileName:/1.kt
CONST Null type=kotlin.Nothing? value=null
PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val]
overridden:
public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>?
FUN FAKE_OVERRIDE name:<get-entries> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>? [fake_override]
public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>>
FUN FAKE_OVERRIDE name:<get-entries> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>> [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-entries> (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>? declared in <root>.Java1
public open fun <get-entries> (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>> declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val]
overridden:
public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>?
FUN FAKE_OVERRIDE name:<get-keys> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>? [fake_override]
public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>
FUN FAKE_OVERRIDE name:<get-keys> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-keys> (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>? declared in <root>.Java1
public open fun <get-keys> (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val]
overridden:
public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>?
FUN FAKE_OVERRIDE name:<get-values> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>? [fake_override]
public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>
FUN FAKE_OVERRIDE name:<get-values> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-values> (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>? declared in <root>.Java1
public open fun <get-values> (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
FUN name:test visibility:public modality:FINAL <> (a:<root>.A, b:<root>.B) returnType:kotlin.Unit
VALUE_PARAMETER name:a index:0 type:<root>.A
compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.sig.kt.txt
Vendored
+31 -30
View File
@@ -150,23 +150,23 @@ abstract class A : Java1 {
// Mangled name: A{}entries
// Public signature: /A.entries|-586096469347622282[0]
// Public signature debug description: {}entries
/* fake */ override val entries: MutableSet<MutableEntry<Void?, Void?>?>?
/* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Void?, @EnhancedNullability Void?>>
// CHECK JVM_IR:
// Mangled name: A#<get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?,java.lang.Void?>?>?
// Public signature: /A.entries.<get-entries>|-6070695281271194003[0]
// Public signature debug description: <get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?,java.lang.Void?>?>?
/* fake */ override get(): MutableSet<MutableEntry<Void?, Void?>?>?
// Mangled name: A#<get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?{EnhancedNullability},java.lang.Void?{EnhancedNullability}>{EnhancedNullability}>{EnhancedNullability}
// Public signature: /A.entries.<get-entries>|-1449002387372962939[0]
// Public signature debug description: <get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?{EnhancedNullability},java.lang.Void?{EnhancedNullability}>{EnhancedNullability}>{EnhancedNullability}
/* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Void?, @EnhancedNullability Void?>>
// CHECK:
// Mangled name: A{}keys
// Public signature: /A.keys|-1539062068328255324[0]
// Public signature debug description: {}keys
/* fake */ override val keys: MutableSet<Void?>?
/* fake */ override val keys: @EnhancedNullability MutableSet<@EnhancedNullability Void?>
// CHECK JVM_IR:
// Mangled name: A#<get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?>?
// Public signature: /A.keys.<get-keys>|6556245738399573293[0]
// Public signature debug description: <get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?>?
/* fake */ override get(): MutableSet<Void?>?
// Mangled name: A#<get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
// Public signature: /A.keys.<get-keys>|6266223291892564583[0]
// Public signature debug description: <get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
/* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability Void?>
// CHECK:
// Mangled name: A{}size
@@ -183,12 +183,12 @@ abstract class A : Java1 {
// Mangled name: A{}values
// Public signature: /A.values|-764749005844117249[0]
// Public signature debug description: {}values
/* fake */ override val values: MutableCollection<Void?>?
/* fake */ override val values: @EnhancedNullability MutableCollection<@EnhancedNullability Void?>
// CHECK JVM_IR:
// Mangled name: A#<get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?>?
// Public signature: /A.values.<get-values>|3365463410528719249[0]
// Public signature debug description: <get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?>?
/* fake */ override get(): MutableCollection<Void?>?
// Mangled name: A#<get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
// Public signature: /A.values.<get-values>|-4884439515124608116[0]
// Public signature debug description: <get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
/* fake */ override get(): @EnhancedNullability MutableCollection<@EnhancedNullability Void?>
}
@@ -355,34 +355,34 @@ class B : Java1 {
// Mangled name: B{}entries
// Public signature: /B.entries|-586096469347622282[0]
// Public signature debug description: {}entries
/* fake */ override val entries: MutableSet<MutableEntry<Void?, Void?>?>?
/* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Void?, @EnhancedNullability Void?>>
// CHECK JVM_IR:
// Mangled name: B#<get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?,java.lang.Void?>?>?
// Public signature: /B.entries.<get-entries>|-6070695281271194003[0]
// Public signature debug description: <get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?,java.lang.Void?>?>?
/* fake */ override get(): MutableSet<MutableEntry<Void?, Void?>?>?
// Mangled name: B#<get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?{EnhancedNullability},java.lang.Void?{EnhancedNullability}>{EnhancedNullability}>{EnhancedNullability}
// Public signature: /B.entries.<get-entries>|-1449002387372962939[0]
// Public signature debug description: <get-entries>(){}kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<java.lang.Void?{EnhancedNullability},java.lang.Void?{EnhancedNullability}>{EnhancedNullability}>{EnhancedNullability}
/* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Void?, @EnhancedNullability Void?>>
// CHECK:
// Mangled name: B{}keys
// Public signature: /B.keys|-1539062068328255324[0]
// Public signature debug description: {}keys
/* fake */ override val keys: MutableSet<Void?>?
/* fake */ override val keys: @EnhancedNullability MutableSet<@EnhancedNullability Void?>
// CHECK JVM_IR:
// Mangled name: B#<get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?>?
// Public signature: /B.keys.<get-keys>|6556245738399573293[0]
// Public signature debug description: <get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?>?
/* fake */ override get(): MutableSet<Void?>?
// Mangled name: B#<get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
// Public signature: /B.keys.<get-keys>|6266223291892564583[0]
// Public signature debug description: <get-keys>(){}kotlin.collections.MutableSet<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
/* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability Void?>
// CHECK:
// Mangled name: B{}values
// Public signature: /B.values|-764749005844117249[0]
// Public signature debug description: {}values
/* fake */ override val values: MutableCollection<Void?>?
/* fake */ override val values: @EnhancedNullability MutableCollection<@EnhancedNullability Void?>
// CHECK JVM_IR:
// Mangled name: B#<get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?>?
// Public signature: /B.values.<get-values>|3365463410528719249[0]
// Public signature debug description: <get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?>?
/* fake */ override get(): MutableCollection<Void?>?
// Mangled name: B#<get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
// Public signature: /B.values.<get-values>|-4884439515124608116[0]
// Public signature debug description: <get-values>(){}kotlin.collections.MutableCollection<java.lang.Void?{EnhancedNullability}>{EnhancedNullability}
/* fake */ override get(): @EnhancedNullability MutableCollection<@EnhancedNullability Void?>
}
@@ -391,3 +391,4 @@ class B : Java1 {
// Public signature: /test|-2533013708701322011[0]
// Public signature debug description: test(A;B){}
fun test(a: A, b: B): Unit