From 973e337bf5033abda5e96344b390e1ecaede9289 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Wed, 28 Feb 2024 10:41:14 +0100 Subject: [PATCH] [FIR] Enhance getter overrides based on overridden properties 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 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 + ...sticCompilerFE10TestDataTestGenerated.java | 6 + ...eeOldFrontendDiagnosticsTestGenerated.java | 6 + ...siOldFrontendDiagnosticsTestGenerated.java | 6 + .../java/enhancement/SignatureEnhancement.kt | 39 ++- .../JavaClassMembersEnhancementScope.kt | 14 +- .../diagnostics/tests/j+k/kt62118.fir.kt | 40 +++ .../testData/diagnostics/tests/j+k/kt62118.kt | 40 +++ .../ir/irText/classes/kt45853.__AX.fir.ir.txt | 2 +- .../ir/irText/classes/kt45853.fir.ir.txt | 8 +- .../ir/irText/classes/kt45853.fir.sig.kt.txt | 11 +- .../annotatedTypeParameter.fir.ir.txt | 18 +- .../annotatedTypeParameter.fir.sig.kt.txt | 30 +- .../platformAnnotationOverride.fir.ir.txt | 44 +-- .../platformAnnotationOverride.fir.sig.kt.txt | 47 +-- .../map/intersectionMapOverrideKJJ.fir.ir.txt | 60 ++-- .../intersectionMapOverrideKJJ.fir.sig.kt.txt | 61 ++-- .../map/intersectionMapOverrideKJK.fir.ir.txt | 48 ++-- .../intersectionMapOverrideKJK.fir.sig.kt.txt | 61 ++-- ...ectionWithGenericMapOverrideKJJ.fir.ir.txt | 60 ++-- ...onWithGenericMapOverrideKJJ.fir.sig.kt.txt | 61 ++-- ...ectionWithGenericMapOverrideKJK.fir.ir.txt | 48 ++-- ...onWithGenericMapOverrideKJK.fir.sig.kt.txt | 61 ++-- .../map/mapOverrideKJKJ.fir.ir.txt | 54 ++-- .../map/mapOverrideKJKJ.fir.sig.kt.txt | 91 +++--- .../mapOverrideOnComplexHierarchy.fir.ir.txt | 222 +++++++------- ...pOverrideOnComplexHierarchy.fir.sig.kt.txt | 271 +++++++++--------- .../map/mapOverrideOnKJ.fir.ir.txt | 34 +-- .../map/mapOverrideOnKJ.fir.sig.kt.txt | 51 ++-- .../map/mapOverrideOnKJJ.fir.ir.txt | 36 +-- .../map/mapOverrideOnKJJ.fir.sig.kt.txt | 61 ++-- .../map/substitutionMapOverrideKJJ.fir.ir.txt | 36 +-- .../substitutionMapOverrideKJJ.fir.sig.kt.txt | 61 ++-- .../substitutionMapOverrideOnKJKJ.fir.ir.txt | 54 ++-- ...bstitutionMapOverrideOnKJKJ.fir.sig.kt.txt | 91 +++--- .../map/sunstitutionMapOverrideKJ.fir.ir.txt | 36 +-- .../sunstitutionMapOverrideKJ.fir.sig.kt.txt | 61 ++-- .../collections/set/setOverrideKJJ.fir.ir.txt | 36 +-- .../set/setOverrideKJJ.fir.sig.kt.txt | 61 ++-- ...uenceMapIntersectionOverrideKJJ.fir.ir.txt | 48 ++-- ...eMapIntersectionOverrideKJJ.fir.sig.kt.txt | 61 ++-- .../test/runners/DiagnosticTestGenerated.java | 6 + 42 files changed, 1140 insertions(+), 1008 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/j+k/kt62118.fir.kt create mode 100644 compiler/testData/diagnostics/tests/j+k/kt62118.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index 9540d77e01f..82207710a6a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -22588,6 +22588,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/j+k/kt60580.kt"); } + @Test + @TestMetadata("kt62118.kt") + public void testKt62118() { + runTest("compiler/testData/diagnostics/tests/j+k/kt62118.kt"); + } + @Test @TestMetadata("kt62197.kt") public void testKt62197() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index fa305daeaae..3434840afe8 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -22588,6 +22588,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/j+k/kt60580.kt"); } + @Test + @TestMetadata("kt62118.kt") + public void testKt62118() { + runTest("compiler/testData/diagnostics/tests/j+k/kt62118.kt"); + } + @Test @TestMetadata("kt62197.kt") public void testKt62197() { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 8ce970caac5..c1e1e395cab 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -22582,6 +22582,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/j+k/kt60580.kt"); } + @Test + @TestMetadata("kt62118.kt") + public void testKt62118() { + runTest("compiler/testData/diagnostics/tests/j+k/kt62118.kt"); + } + @Test @TestMetadata("kt62197.kt") public void testKt62197() { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 142795a8ae5..aafff6f79f1 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -22588,6 +22588,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/j+k/kt60580.kt"); } + @Test + @TestMetadata("kt62118.kt") + public void testKt62118() { + runTest("compiler/testData/diagnostics/tests/j+k/kt62118.kt"); + } + @Test @TestMetadata("kt62197.kt") public void testKt62197() { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt index 27114507a88..ebe6cb73ff1 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt @@ -72,7 +72,7 @@ import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment class FirSignatureEnhancement( private val owner: FirRegularClass, private val session: FirSession, - private val overridden: FirSimpleFunction.() -> List + private val overridden: FirCallableDeclaration.() -> List ) { /* * FirSignatureEnhancement may be created with library session which doesn't have single module data, @@ -94,8 +94,8 @@ class FirSignatureEnhancement( private val enhancementsCache = session.enhancedSymbolStorage.cacheByOwner.getValue(owner.symbol, null) - fun enhancedFunction(function: FirFunctionSymbol<*>, name: Name?): FirFunctionSymbol<*> { - return enhancementsCache.enhancedFunctions.getValue(function, this to name) + fun enhancedFunction(function: FirFunctionSymbol<*>, name: Name?, precomputedOverridden: List? = null): FirFunctionSymbol<*> { + return enhancementsCache.enhancedFunctions.getValue(function, FirEnhancedSymbolsStorage.FunctionEnhancementContext(this, name, precomputedOverridden)) } fun enhancedProperty(property: FirVariableSymbol<*>, name: Name): FirVariableSymbol<*> { @@ -174,9 +174,10 @@ class FirSignatureEnhancement( is FirSyntheticProperty -> { val accessorSymbol = firElement.symbol val getterDelegate = firElement.getter.delegate - val enhancedGetterSymbol = getterDelegate.enhanceAccessorOrNull() + val overridden = firElement.overridden() + val enhancedGetterSymbol = getterDelegate.enhanceAccessorOrNull(overridden) val setterDelegate = firElement.setter?.delegate - val enhancedSetterSymbol = setterDelegate?.enhanceAccessorOrNull() + val enhancedSetterSymbol = setterDelegate?.enhanceAccessorOrNull(overridden) if (enhancedGetterSymbol == null && enhancedSetterSymbol == null) { return original } @@ -199,15 +200,16 @@ class FirSignatureEnhancement( } } - private fun FirSimpleFunction.enhanceAccessorOrNull(): FirFunctionSymbol<*>? { + private fun FirSimpleFunction.enhanceAccessorOrNull(overriddenProperties: List): FirFunctionSymbol<*>? { if (!symbol.isEnhanceable()) return null - return enhancedFunction(symbol, name) + return enhancedFunction(symbol, name, overriddenProperties) } @PrivateForInline internal fun enhance( original: FirFunctionSymbol<*>, name: Name?, + precomputedOverridden: List?, ): FirFunctionSymbol<*> { if (!original.isEnhanceable()) { return original @@ -215,7 +217,7 @@ class FirSignatureEnhancement( val firMethod = original.fir val enhancedParameters = enhanceTypeParameterBoundsForMethod(firMethod) - return enhanceMethod(firMethod, original.callableId, name, enhancedParameters, original is FirIntersectionOverrideFunctionSymbol) + return enhanceMethod(firMethod, original.callableId, name, enhancedParameters, original is FirIntersectionOverrideFunctionSymbol, precomputedOverridden) } private fun FirCallableSymbol<*>.isEnhanceable(): Boolean { @@ -248,6 +250,7 @@ class FirSignatureEnhancement( name: Name?, enhancedTypeParameters: List?, isIntersectionOverride: Boolean, + precomputedOverridden: List?, ): FirFunctionSymbol<*> { val predefinedEnhancementInfo = SignatureBuildingComponents.signature( @@ -264,7 +267,7 @@ class FirSignatureEnhancement( } val defaultQualifiers = firMethod.computeDefaultQualifiers() - val overriddenMembers = (firMethod as? FirSimpleFunction)?.overridden().orEmpty() + val overriddenMembers = precomputedOverridden ?: (firMethod as? FirSimpleFunction)?.overridden().orEmpty() val hasReceiver = overriddenMembers.any { it.receiverParameter != null } val newReceiverTypeRef = if (firMethod is FirSimpleFunction && hasReceiver) { @@ -749,6 +752,10 @@ class FirSignatureEnhancement( class ValueParameter(val hasReceiver: Boolean, val index: Int) : TypeInSignature() { override fun getTypeRef(member: FirCallableDeclaration): FirTypeRef { + // When we enhance a setter override, the overridden property's return type corresponds to the setter's value parameter. + if (member is FirProperty) { + return member.returnTypeRef + } if (hasReceiver && member is FirSimpleFunction && member.isJava) { return member.valueParameters[index + 1].returnTypeRef } @@ -895,17 +902,23 @@ class FirEnhancedSymbolsStorage(private val cachesFactory: FirCachesFactory) : F val cacheByOwner: FirCache = cachesFactory.createCache { _ -> EnhancementSymbolsCache(cachesFactory) } + class FunctionEnhancementContext( + val enhancement: FirSignatureEnhancement, + val name: Name?, + val precomputedOverridden: List?, + ) + class EnhancementSymbolsCache(cachesFactory: FirCachesFactory) { @OptIn(PrivateForInline::class) - val enhancedFunctions: FirCache, FirFunctionSymbol<*>, Pair> = + val enhancedFunctions: FirCache, FirFunctionSymbol<*>, FunctionEnhancementContext> = cachesFactory.createCacheWithPostCompute( - createValue = { original, (enhancement, name) -> - enhancement.enhance(original, name) to enhancement + createValue = { original, context -> + context.enhancement.enhance(original, context.name, context.precomputedOverridden) to context.enhancement }, postCompute = { _, enhancedVersion, enhancement -> val enhancedVersionFir = enhancedVersion.fir (enhancedVersionFir.initialSignatureAttr as? FirSimpleFunction)?.let { - enhancedVersionFir.initialSignatureAttr = enhancement.enhancedFunction(it.symbol, it.name).fir + enhancedVersionFir.initialSignatureAttr = enhancement.enhancedFunction(it.symbol, it.name,).fir } } ) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt index 0e245627f53..9a22cfa487c 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt @@ -11,11 +11,9 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.initialSignatureAttr import org.jetbrains.kotlin.fir.java.enhancement.FirSignatureEnhancement -import org.jetbrains.kotlin.fir.scopes.FirDelegatingTypeScope -import org.jetbrains.kotlin.fir.scopes.FirTypeScope -import org.jetbrains.kotlin.fir.scopes.ProcessorAction -import org.jetbrains.kotlin.fir.scopes.getDirectOverriddenMembers -import org.jetbrains.kotlin.fir.scopes.getDirectOverriddenProperties +import org.jetbrains.kotlin.fir.java.symbols.FirJavaOverriddenSyntheticPropertySymbol +import org.jetbrains.kotlin.fir.resolve.calls.syntheticNamesProvider +import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.name.Name @@ -56,11 +54,7 @@ class JavaClassMembersEnhancementScope( } private fun FirCallableDeclaration.overriddenMembers(): List { - return when (val symbol = this.symbol) { - is FirNamedFunctionSymbol -> useSiteMemberScope.getDirectOverriddenMembers(symbol) - is FirPropertySymbol -> useSiteMemberScope.getDirectOverriddenProperties(symbol) - else -> emptyList() - }.map { it.fir } + return useSiteMemberScope.getDirectOverriddenMembers(symbol).map { it.fir } } override fun processDeclaredConstructors(processor: (FirConstructorSymbol) -> Unit) { diff --git a/compiler/testData/diagnostics/tests/j+k/kt62118.fir.kt b/compiler/testData/diagnostics/tests/j+k/kt62118.fir.kt new file mode 100644 index 00000000000..da5f24f4d9a --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/kt62118.fir.kt @@ -0,0 +1,40 @@ +// ISSUE: KT-62118 +// FILE: test.kt +class MyMutableEntry( + override val key: K, override var value: V +) : MutableMap.MutableEntry { + override fun setValue(newValue: V): V { + value = newValue + return value + } +} + +class MyImmutableEntry( + override val key: K, override val value: V +) : Map.Entry + +fun entries(map: HashMap) = map.entries +fun keys(map: HashMap) = map.keys +fun value(map: HashMap) = map.values + +fun test() { + val map = HashMap() + entries(map).add(MyMutableEntry(null, null)) + entries(map).add(MyMutableEntry("", 1)) + entries(map).add(MyImmutableEntry("", 1)) + keys(map).add(null) + value(map).add(null) + + J().setX(null) + J().x = null +} + +open class K { + var x: String = "" +} + +// FILE: J.java +public class J extends K { + @Override + public void setX(String value) {} +} diff --git a/compiler/testData/diagnostics/tests/j+k/kt62118.kt b/compiler/testData/diagnostics/tests/j+k/kt62118.kt new file mode 100644 index 00000000000..c1fe0ca4645 --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/kt62118.kt @@ -0,0 +1,40 @@ +// ISSUE: KT-62118 +// FILE: test.kt +class MyMutableEntry( + override val key: K, override var value: V +) : MutableMap.MutableEntry { + override fun setValue(newValue: V): V { + value = newValue + return value + } +} + +class MyImmutableEntry( + override val key: K, override val value: V +) : Map.Entry + +fun entries(map: HashMap) = map.entries +fun keys(map: HashMap) = map.keys +fun value(map: HashMap) = map.values + +fun test() { + val map = HashMap() + entries(map).add(MyMutableEntry(null, null)) + entries(map).add(MyMutableEntry("", 1)) + entries(map).add(MyImmutableEntry("", 1)) + keys(map).add(null) + value(map).add(null) + + J().setX(null) + J().x = null +} + +open class K { + var x: String = "" +} + +// FILE: J.java +public class J extends K { + @Override + public void setX(String value) {} +} \ No newline at end of file diff --git a/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt b/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt index bf2eac5eb6d..dd1a44e88e8 100644 --- a/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt @@ -8,7 +8,7 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:AX modality:ABSTRACT visibili PROPERTY IR_EXTERNAL_JAVA_DECLARATION_STUB name:a visibility:public modality:OPEN [val] overridden: public abstract a: .A? [val] - FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name: visibility:public modality:OPEN <> ($this:.AX) returnType:@[FlexibleNullability] .AX? + FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name: visibility:public modality:OPEN <> ($this:.AX) returnType:@[EnhancedNullability] .AX? annotations: Override correspondingProperty: PROPERTY IR_EXTERNAL_JAVA_DECLARATION_STUB name:a visibility:public modality:OPEN [val] diff --git a/compiler/testData/ir/irText/classes/kt45853.fir.ir.txt b/compiler/testData/ir/irText/classes/kt45853.fir.ir.txt index 43a50cc10b2..8dfe7bd8c09 100644 --- a/compiler/testData/ir/irText/classes/kt45853.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/kt45853.fir.ir.txt @@ -47,15 +47,15 @@ FILE fqName: fileName:/kt45853.kt $this: VALUE_PARAMETER name: type:.B BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun getA (): .X? declared in .B' - CALL 'public open fun (): @[FlexibleNullability] .AX? declared in .AX' superQualifier='CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:AX modality:ABSTRACT visibility:public superTypes:[.A; .X]' type=@[FlexibleNullability] .AX? origin=GET_PROPERTY + CALL 'public open fun (): @[EnhancedNullability] .AX? declared in .AX' superQualifier='CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:AX modality:ABSTRACT visibility:public superTypes:[.A; .X]' type=@[EnhancedNullability] .AX? origin=GET_PROPERTY $this: GET_VAR ': .B declared in .B.getA' type=.B origin=null PROPERTY FAKE_OVERRIDE name:a visibility:public modality:OPEN [fake_override,val] overridden: - public open a: @[FlexibleNullability] .AX? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.AX) returnType:@[FlexibleNullability] .AX? [fake_override] + public open a: @[EnhancedNullability] .AX? + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.AX) returnType:@[EnhancedNullability] .AX? [fake_override] annotations: Override correspondingProperty: PROPERTY FAKE_OVERRIDE name:a visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] .AX? declared in .AX + public open fun (): @[EnhancedNullability] .AX? declared in .AX $this: VALUE_PARAMETER name: type:.AX diff --git a/compiler/testData/ir/irText/classes/kt45853.fir.sig.kt.txt b/compiler/testData/ir/irText/classes/kt45853.fir.sig.kt.txt index 57cdc559b96..3d09ef98e68 100644 --- a/compiler/testData/ir/irText/classes/kt45853.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/kt45853.fir.sig.kt.txt @@ -41,12 +41,13 @@ class B : AX { // Mangled name: B{}a // Public signature: /B.a|-1200697420457237799[0] // Public signature debug description: {}a - /* fake */ override val a: AX? + /* fake */ override val a: @EnhancedNullability AX? // CHECK JVM_IR: - // Mangled name: B#(){}AX? - // Public signature: /B.a.|243290884802757470[0] - // Public signature debug description: (){}AX? + // Mangled name: B#(){}AX?{EnhancedNullability} + // Public signature: /B.a.|1682004550888840418[0] + // Public signature debug description: (){}AX?{EnhancedNullability} @Override - /* fake */ override get(): AX? + /* fake */ override get(): @EnhancedNullability AX? } + diff --git a/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.ir.txt index d6e4e4f7ad7..d362eac7f27 100644 --- a/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.ir.txt @@ -185,19 +185,19 @@ FILE fqName: fileName:/B.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -209,9 +209,9 @@ FILE fqName: fileName:/B.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap diff --git a/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.sig.kt.txt index c3c614fbbf4..ef7150ddb9f 100644 --- a/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/annotatedTypeParameter.fir.sig.kt.txt @@ -172,23 +172,23 @@ abstract class B : SortedMap { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}size @@ -205,12 +205,12 @@ abstract class B : SortedMap { // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection? - // Public signature: /B.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } diff --git a/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.ir.txt index 5614015b17a..00496fae237 100644 --- a/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.ir.txt @@ -150,26 +150,26 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:a visibility:public modality:OPEN [fake_override,val] overridden: - public open a: @[FlexibleNullability] kotlin.String? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2) returnType:@[FlexibleNullability] kotlin.String? [fake_override] + public open a: @[EnhancedNullability] kotlin.String + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:a visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] kotlin.String? declared in .Java2 + public open fun (): @[EnhancedNullability] kotlin.String declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:c visibility:public modality:OPEN [fake_override,var] overridden: - public open c: @[FlexibleNullability] kotlin.String? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2) returnType:@[FlexibleNullability] kotlin.String? [fake_override] + public open c: @[EnhancedNullability] kotlin.String + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:OPEN [fake_override,var] overridden: - public open fun (): @[FlexibleNullability] kotlin.String? declared in .Java2 + public open fun (): @[EnhancedNullability] kotlin.String declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2, text:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Unit [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2, text:@[EnhancedNullability] kotlin.String) returnType:kotlin.Unit [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:OPEN [fake_override,var] overridden: - public open fun (text: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .Java2 + public open fun (text: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 - VALUE_PARAMETER name:text index:0 type:@[FlexibleNullability] kotlin.String? + VALUE_PARAMETER name:text index:0 type:@[EnhancedNullability] kotlin.String CLASS CLASS name:D modality:FINAL visibility:public superTypes:[.Java2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.D CONSTRUCTOR visibility:public <> () returnType:.D [primary] @@ -203,25 +203,25 @@ FILE fqName: fileName:/1.kt BLOCK_BODY PROPERTY FAKE_OVERRIDE name:c visibility:public modality:OPEN [fake_override,var] overridden: - public open c: @[FlexibleNullability] kotlin.String? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2) returnType:@[FlexibleNullability] kotlin.String? [fake_override] + public open c: @[EnhancedNullability] kotlin.String + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:OPEN [fake_override,var] overridden: - public open fun (): @[FlexibleNullability] kotlin.String? declared in .Java2 + public open fun (): @[EnhancedNullability] kotlin.String declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2, text:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Unit [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java2, text:@[EnhancedNullability] kotlin.String) returnType:kotlin.Unit [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:OPEN [fake_override,var] overridden: - public open fun (text: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .Java2 + public open fun (text: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 - VALUE_PARAMETER name:text index:0 type:@[FlexibleNullability] kotlin.String? + VALUE_PARAMETER name:text index:0 type:@[EnhancedNullability] kotlin.String PROPERTY name:a visibility:public modality:OPEN [val] overridden: - public open a: @[FlexibleNullability] kotlin.String? + public open a: @[EnhancedNullability] kotlin.String FUN name: visibility:public modality:OPEN <> ($this:.D) returnType:kotlin.String correspondingProperty: PROPERTY name:a visibility:public modality:OPEN [val] overridden: - public open fun (): @[FlexibleNullability] kotlin.String? declared in .Java2 + public open fun (): @[EnhancedNullability] kotlin.String declared in .Java2 $this: VALUE_PARAMETER name: type:.D BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.String declared in .D' @@ -749,12 +749,12 @@ FILE fqName: fileName:/1.kt second: CONST String type=kotlin.String value="2" third: CONST Int type=kotlin.Int value=3 TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun (): @[FlexibleNullability] kotlin.String? declared in .C' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + CALL 'public open fun (): @[EnhancedNullability] kotlin.String declared in .C' type=@[EnhancedNullability] kotlin.String origin=GET_PROPERTY $this: GET_VAR 'c: .C declared in .test' type=.C origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun (): @[FlexibleNullability] kotlin.String? declared in .C' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + CALL 'public open fun (): @[EnhancedNullability] kotlin.String declared in .C' type=@[EnhancedNullability] kotlin.String origin=GET_PROPERTY $this: GET_VAR 'c: .C declared in .test' type=.C origin=null - CALL 'public open fun (text: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .C' type=kotlin.Unit origin=EQ + CALL 'public open fun (text: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in .C' type=kotlin.Unit origin=EQ $this: GET_VAR 'c: .C declared in .test' type=.C origin=null text: CONST String type=kotlin.String value="2" CALL 'public open fun overloadMethod (first: @[EnhancedNullability] kotlin.String, second: @[EnhancedNullability] kotlin.String, third: kotlin.Int): kotlin.Unit declared in .C' type=kotlin.Unit origin=null @@ -769,9 +769,9 @@ FILE fqName: fileName:/1.kt CALL 'public open fun (): kotlin.String declared in .D' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR 'd: .D declared in .test' type=.D origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun (): @[FlexibleNullability] kotlin.String? declared in .D' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + CALL 'public open fun (): @[EnhancedNullability] kotlin.String declared in .D' type=@[EnhancedNullability] kotlin.String origin=GET_PROPERTY $this: GET_VAR 'd: .D declared in .test' type=.D origin=null - CALL 'public open fun (text: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .D' type=kotlin.Unit origin=EQ + CALL 'public open fun (text: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in .D' type=kotlin.Unit origin=EQ $this: GET_VAR 'd: .D declared in .test' type=.D origin=null text: CONST String type=kotlin.String value="2" CALL 'public open fun overloadMethod (first: kotlin.String, second: kotlin.String, third: kotlin.Int): kotlin.Unit declared in .D' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.sig.kt.txt index 21404462948..ba64d1d1bab 100644 --- a/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/annotations/platformAnnotationOverride.fir.sig.kt.txt @@ -133,28 +133,28 @@ class C : Java2 { // Mangled name: C{}a // Public signature: /C.a|-1200697420457237799[0] // Public signature debug description: {}a - /* fake */ override val a: String? + /* fake */ override val a: @EnhancedNullability String // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.String? - // Public signature: /C.a.|-3827020536169281094[0] - // Public signature debug description: (){}kotlin.String? - /* fake */ override get(): String? + // Mangled name: C#(){}kotlin.String{EnhancedNullability} + // Public signature: /C.a.|-7145393266243152488[0] + // Public signature debug description: (){}kotlin.String{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability String // CHECK: // Mangled name: C{}c // Public signature: /C.c|-4416962153448040627[0] // Public signature debug description: {}c - /* fake */ override var c: String? + /* fake */ override var c: @EnhancedNullability String // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.String? - // Public signature: /C.c.|-6320399562288171885[0] - // Public signature debug description: (){}kotlin.String? - /* fake */ override get(): String? + // Mangled name: C#(){}kotlin.String{EnhancedNullability} + // Public signature: /C.c.|-2824529966014301292[0] + // Public signature debug description: (){}kotlin.String{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability String // CHECK: - // Mangled name: C#(kotlin.String?){} - // Public signature: /C.c.|7821982893837257305[0] - // Public signature debug description: (kotlin.String?){} - /* fake */ override set(text: String?): Unit + // Mangled name: C#(kotlin.String{EnhancedNullability}){} + // Public signature: /C.c.|163997591642030389[0] + // Public signature debug description: (kotlin.String{EnhancedNullability}){} + /* fake */ override set(text: @EnhancedNullability String): Unit } @@ -184,17 +184,17 @@ class D : Java2 { // Mangled name: D{}c // Public signature: /D.c|-4416962153448040627[0] // Public signature debug description: {}c - /* fake */ override var c: String? + /* fake */ override var c: @EnhancedNullability String // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.String? - // Public signature: /D.c.|-6320399562288171885[0] - // Public signature debug description: (){}kotlin.String? - /* fake */ override get(): String? + // Mangled name: D#(){}kotlin.String{EnhancedNullability} + // Public signature: /D.c.|-2824529966014301292[0] + // Public signature debug description: (){}kotlin.String{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability String // CHECK: - // Mangled name: D#(kotlin.String?){} - // Public signature: /D.c.|7821982893837257305[0] - // Public signature debug description: (kotlin.String?){} - /* fake */ override set(text: String?): Unit + // Mangled name: D#(kotlin.String{EnhancedNullability}){} + // Public signature: /D.c.|163997591642030389[0] + // Public signature debug description: (kotlin.String{EnhancedNullability}){} + /* fake */ override set(text: @EnhancedNullability String): Unit // CHECK: // Mangled name: D{}a @@ -658,3 +658,4 @@ interface KotlinInterface { // Public signature: /test|-2663909601123444132[0] // Public signature debug description: test(A;B;C;D;E;F;G;H){} fun test(a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.ir.txt index 2ee719d2ee7..7c9d4dcbe71 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.ir.txt @@ -184,23 +184,23 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -214,13 +214,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; java.util.HashMap] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B @@ -417,23 +417,23 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=false PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -447,13 +447,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.sig.kt.txt index fa3d8b9a515..858718597ad 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJJ.fir.sig.kt.txt @@ -180,23 +180,23 @@ abstract class A : HashMap, SortedMap { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet? - // Public signature: /A.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: A{}size @@ -213,12 +213,12 @@ abstract class A : HashMap, SortedMap { // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection? - // Public signature: /A.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -410,23 +410,23 @@ abstract class B : HashMap, SortedMap { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}size @@ -443,12 +443,12 @@ abstract class B : HashMap, SortedMap { // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection? - // Public signature: /B.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -457,3 +457,4 @@ abstract class B : HashMap, SortedMap { // Public signature: /test|-2533013708701322011[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.ir.txt index dfaa5c1bcff..a80c73cd167 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.ir.txt @@ -168,24 +168,24 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> public abstract entries: kotlin.collections.Set> - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map) returnType:kotlin.collections.Set> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set> declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> public abstract keys: kotlin.collections.Set - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map) returnType:kotlin.collections.Set [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int @@ -198,14 +198,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> public abstract values: kotlin.collections.Collection - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map) returnType:kotlin.collections.Collection [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Collection declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map + $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; kotlin.collections.Map] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B CONSTRUCTOR visibility:public <> () returnType:.B [primary] @@ -381,24 +381,24 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=false PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> public abstract entries: kotlin.collections.Set> - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map) returnType:kotlin.collections.Set> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set> declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> public abstract keys: kotlin.collections.Set - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map) returnType:kotlin.collections.Set [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int @@ -411,14 +411,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> public abstract values: kotlin.collections.Collection - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map) returnType:kotlin.collections.Collection [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Collection declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map + $this: VALUE_PARAMETER name: type:java.util.SortedMap FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A VALUE_PARAMETER name:b index:1 type:.B diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.sig.kt.txt index 148d51471eb..cf382bc2108 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionMapOverrideKJK.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : SortedMap, Map { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: Set> + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.Set> - // Public signature: /A.entries.|-2809354568196108179[0] - // Public signature debug description: (){}kotlin.collections.Set> - abstract /* fake */ override get(): Set> + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: Set + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.Set - // Public signature: /A.keys.|725560008518957077[0] - // Public signature debug description: (){}kotlin.collections.Set - abstract /* fake */ override get(): Set + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: A{}size @@ -183,12 +183,12 @@ abstract class A : SortedMap, Map { // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: Collection + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.Collection - // Public signature: /A.values.|3980202946551805295[0] - // Public signature debug description: (){}kotlin.collections.Collection - abstract /* fake */ override get(): Collection + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -344,23 +344,23 @@ abstract class B : SortedMap, Map { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: Set> + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.Set> - // Public signature: /B.entries.|-2809354568196108179[0] - // Public signature debug description: (){}kotlin.collections.Set> - abstract /* fake */ override get(): Set> + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: Set + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.Set - // Public signature: /B.keys.|725560008518957077[0] - // Public signature debug description: (){}kotlin.collections.Set - abstract /* fake */ override get(): Set + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}size @@ -377,12 +377,12 @@ abstract class B : SortedMap, Map { // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: Collection + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.Collection - // Public signature: /B.values.|3980202946551805295[0] - // Public signature debug description: (){}kotlin.collections.Collection - abstract /* fake */ override get(): Collection + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -391,3 +391,4 @@ abstract class B : SortedMap, Map { // Public signature: /test|-2533013708701322011[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.ir.txt index bfb3f5c7a2c..811d117db89 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.ir.txt @@ -185,23 +185,23 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -215,13 +215,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap.B, T of .B>; java.util.HashMap.B, T of .B>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B.B> @@ -419,23 +419,23 @@ FILE fqName: fileName:/1.kt arg0: CONST Null type=kotlin.Nothing? value=null PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -449,13 +449,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.sig.kt.txt index a7321dd2497..e2fa27550ba 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJJ.fir.sig.kt.txt @@ -180,23 +180,23 @@ abstract class A : HashMap, SortedMap { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /A.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /A.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: A{}size @@ -213,12 +213,12 @@ abstract class A : HashMap, SortedMap { // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /A.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /A.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -404,23 +404,23 @@ abstract class B : HashMap, SortedMap { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /B.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /B.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}size @@ -437,12 +437,12 @@ abstract class B : HashMap, SortedMap { // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /B.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /B.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -451,3 +451,4 @@ abstract class B : HashMap, SortedMap { // Public signature: /test|7309038897648133437[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.ir.txt index 058d00a90ac..bde2a036343 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.ir.txt @@ -169,24 +169,24 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> public abstract entries: kotlin.collections.Set> - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.A, T of .A>) returnType:kotlin.collections.Set.A, T of .A>> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set> declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.A, T of .A> + $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> public abstract keys: kotlin.collections.Set - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.A, T of .A>) returnType:kotlin.collections.Set.A> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.A, T of .A> + $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int @@ -199,14 +199,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> public abstract values: kotlin.collections.Collection - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.A, T of .A>) returnType:kotlin.collections.Collection.A> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.A, T of .A>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Collection declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.A, T of .A> + $this: VALUE_PARAMETER name: type:java.util.SortedMap.A, T of .A> CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap.B, T of .B>; kotlin.collections.Map.B, T of .B>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B.B> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false @@ -387,24 +387,24 @@ FILE fqName: fileName:/1.kt arg0: CONST Null type=kotlin.Nothing? value=null PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> public abstract entries: kotlin.collections.Set> - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.B, T of .B>) returnType:kotlin.collections.Set.B, T of .B>> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set> declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.B, T of .B> + $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> public abstract keys: kotlin.collections.Set - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.B, T of .B>) returnType:kotlin.collections.Set.B> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Set declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.B, T of .B> + $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int @@ -417,14 +417,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> public abstract values: kotlin.collections.Collection - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.B, T of .B>) returnType:kotlin.collections.Collection.B> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.B, T of .B>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.Collection declared in kotlin.collections.Map - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.B, T of .B> + $this: VALUE_PARAMETER name: type:java.util.SortedMap.B, T of .B> FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A VALUE_PARAMETER name:b index:1 type:.B diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.sig.kt.txt index 35728873af9..18f4cc5f043 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/intersectionWithGenericMapOverrideKJK.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : SortedMap, Map { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: Set> + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.Set> - // Public signature: /A.entries.|-5986194983903192721[0] - // Public signature debug description: (){}kotlin.collections.Set> - abstract /* fake */ override get(): Set> + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: Set + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.Set<1:0> - // Public signature: /A.keys.|4915091794204623606[0] - // Public signature debug description: (){}kotlin.collections.Set<1:0> - abstract /* fake */ override get(): Set + // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /A.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: A{}size @@ -183,12 +183,12 @@ abstract class A : SortedMap, Map { // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: Collection + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.Collection<1:0> - // Public signature: /A.values.|2266299290016332619[0] - // Public signature debug description: (){}kotlin.collections.Collection<1:0> - abstract /* fake */ override get(): Collection + // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /A.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -344,23 +344,23 @@ abstract class B : SortedMap, Map { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: Set> + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.Set> - // Public signature: /B.entries.|-5986194983903192721[0] - // Public signature debug description: (){}kotlin.collections.Set> - abstract /* fake */ override get(): Set> + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: Set + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.Set<1:0> - // Public signature: /B.keys.|4915091794204623606[0] - // Public signature debug description: (){}kotlin.collections.Set<1:0> - abstract /* fake */ override get(): Set + // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /B.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}size @@ -377,12 +377,12 @@ abstract class B : SortedMap, Map { // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: Collection + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.Collection<1:0> - // Public signature: /B.values.|2266299290016332619[0] - // Public signature debug description: (){}kotlin.collections.Collection<1:0> - abstract /* fake */ override get(): Collection + // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /B.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -391,3 +391,4 @@ abstract class B : SortedMap, Map { // Public signature: /test|7309038897648133437[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.ir.txt index a37ec4d54bf..518af1740bf 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.ir.txt @@ -159,19 +159,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -183,11 +183,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[.Java1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B @@ -355,27 +355,27 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=true PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY name:size visibility:public modality:OPEN [val] overridden: @@ -548,19 +548,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -572,11 +572,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.sig.kt.txt index ac28022bbb5..a35e0a0d4ea 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideKJKJ.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : Java1 { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet? - // Public signature: /A.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // 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 - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection? - // Public signature: /A.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -344,34 +344,34 @@ abstract class B : Java1 { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection? - // Public signature: /B.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection // CHECK: // Mangled name: B{}size @@ -538,23 +538,23 @@ abstract class KotlinClass : SortedMap { // Mangled name: KotlinClass{}entries // Public signature: /KotlinClass.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet?>? - // Public signature: /KotlinClass.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /KotlinClass.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: KotlinClass{}keys // Public signature: /KotlinClass.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet? - // Public signature: /KotlinClass.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /KotlinClass.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: KotlinClass{}size @@ -571,12 +571,12 @@ abstract class KotlinClass : SortedMap { // Mangled name: KotlinClass{}values // Public signature: /KotlinClass.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: KotlinClass#(){}kotlin.collections.MutableCollection? - // Public signature: /KotlinClass.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: KotlinClass#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /KotlinClass.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -585,3 +585,4 @@ abstract class KotlinClass : SortedMap { // Public signature: /test|-2533013708701322011[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.ir.txt index 5fddc8f7250..377e923cce8 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.ir.txt @@ -192,23 +192,23 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -222,13 +222,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; java.util.HashMap; .Java1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B @@ -426,23 +426,23 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=false PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -456,13 +456,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:C modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; java.util.HashMap; .KotlinInterface] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.C @@ -657,23 +657,23 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -687,13 +687,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:D modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; java.util.HashMap; .KotlinInterface] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.D @@ -891,23 +891,23 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=true PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - public open entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -921,13 +921,13 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:E modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; kotlin.collections.MutableMap; .KotlinInterface] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.E @@ -1119,24 +1119,24 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> public abstract entries: kotlin.collections.MutableSet> - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:kotlin.collections.MutableSet> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap public abstract fun (): kotlin.collections.MutableSet> declared in kotlin.collections.MutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> public abstract keys: kotlin.collections.MutableSet - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:kotlin.collections.MutableSet [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.MutableSet declared in kotlin.collections.MutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int @@ -1149,14 +1149,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> public abstract values: kotlin.collections.MutableCollection - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:kotlin.collections.MutableCollection [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.MutableCollection declared in kotlin.collections.MutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap + $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:F modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap; kotlin.collections.MutableMap; .KotlinInterface] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.F CONSTRUCTOR visibility:public <> () returnType:.F [primary] @@ -1350,24 +1350,24 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=true PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> public abstract entries: kotlin.collections.MutableSet> - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:kotlin.collections.MutableSet> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap public abstract fun (): kotlin.collections.MutableSet> declared in kotlin.collections.MutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> public abstract keys: kotlin.collections.MutableSet - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:kotlin.collections.MutableSet [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.MutableSet declared in kotlin.collections.MutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap + $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int @@ -1380,14 +1380,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> public abstract values: kotlin.collections.MutableCollection - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:kotlin.collections.MutableCollection [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap public abstract fun (): kotlin.collections.MutableCollection declared in kotlin.collections.MutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap + $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:I modality:ABSTRACT visibility:public superTypes:[.Java1; .Java2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.I CONSTRUCTOR visibility:public <> () returnType:.I [primary] @@ -1556,19 +1556,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? declared in .Java2 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java2 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -1580,11 +1580,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java2 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 CLASS CLASS name:J modality:ABSTRACT visibility:public superTypes:[.Java1; .Java2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.J @@ -1757,19 +1757,19 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=true PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? declared in .Java2 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java2 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -1781,11 +1781,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.Java2 PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java2) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? declared in .Java2 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> declared in .Java2 $this: VALUE_PARAMETER name: type:.Java2 CLASS CLASS name:K modality:ABSTRACT visibility:public superTypes:[.Java1; .Java3] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.K @@ -2655,19 +2655,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -2679,11 +2679,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS INTERFACE name:KotlinInterface3 modality:ABSTRACT visibility:public superTypes:[kotlin.collections.MutableMap] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.KotlinInterface3 diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.sig.kt.txt index b1f499973c7..e924406bb7c 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnComplexHierarchy.fir.sig.kt.txt @@ -186,23 +186,23 @@ abstract class A : HashMap, Java1, SortedMap // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet? - // Public signature: /A.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: A{}size @@ -219,12 +219,12 @@ abstract class A : HashMap, Java1, SortedMap // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection? - // Public signature: /A.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -416,23 +416,23 @@ abstract class B : HashMap, Java1, SortedMap // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}size @@ -449,12 +449,12 @@ abstract class B : HashMap, Java1, SortedMap // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection? - // Public signature: /B.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -646,23 +646,23 @@ abstract class C : HashMap, KotlinInterface, SortedMap?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.collections.MutableSet?>? - // Public signature: /C.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: C#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /C.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: C{}keys // Public signature: /C.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.collections.MutableSet? - // Public signature: /C.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: C#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /C.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: C{}size @@ -679,12 +679,12 @@ abstract class C : HashMap, KotlinInterface, SortedMap? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.collections.MutableCollection? - // Public signature: /C.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: C#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /C.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -876,23 +876,23 @@ abstract class D : HashMap, KotlinInterface, SortedMap?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.collections.MutableSet?>? - // Public signature: /D.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: D#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /D.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: D{}keys // Public signature: /D.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet? + /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.collections.MutableSet? - // Public signature: /D.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: D#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /D.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: D{}size @@ -909,12 +909,12 @@ abstract class D : HashMap, KotlinInterface, SortedMap? + /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.collections.MutableCollection? - // Public signature: /D.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: D#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /D.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -1076,23 +1076,23 @@ abstract class E : KotlinInterface, SortedMap, MutableMap> + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: E#(){}kotlin.collections.MutableSet> - // Public signature: /E.entries.|-8351444907328274428[0] - // Public signature debug description: (){}kotlin.collections.MutableSet> - abstract /* fake */ override get(): MutableSet> + // Mangled name: E#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /E.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: E{}keys // Public signature: /E.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: E#(){}kotlin.collections.MutableSet - // Public signature: /E.keys.|6984112319401937053[0] - // Public signature debug description: (){}kotlin.collections.MutableSet - abstract /* fake */ override get(): MutableSet + // Mangled name: E#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /E.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: E{}size @@ -1109,12 +1109,12 @@ abstract class E : KotlinInterface, SortedMap, MutableMap + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: E#(){}kotlin.collections.MutableCollection - // Public signature: /E.values.|1639693901235765360[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection - abstract /* fake */ override get(): MutableCollection + // Mangled name: E#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /E.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -1276,23 +1276,23 @@ abstract class F : KotlinInterface, SortedMap, MutableMap> + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: F#(){}kotlin.collections.MutableSet> - // Public signature: /F.entries.|-8351444907328274428[0] - // Public signature debug description: (){}kotlin.collections.MutableSet> - abstract /* fake */ override get(): MutableSet> + // Mangled name: F#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /F.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: F{}keys // Public signature: /F.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: F#(){}kotlin.collections.MutableSet - // Public signature: /F.keys.|6984112319401937053[0] - // Public signature debug description: (){}kotlin.collections.MutableSet - abstract /* fake */ override get(): MutableSet + // Mangled name: F#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /F.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: F{}size @@ -1309,12 +1309,12 @@ abstract class F : KotlinInterface, SortedMap, MutableMap + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: F#(){}kotlin.collections.MutableCollection - // Public signature: /F.values.|1639693901235765360[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection - abstract /* fake */ override get(): MutableCollection + // Mangled name: F#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /F.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -1476,23 +1476,23 @@ abstract class I : Java2, Java1 { // Mangled name: I{}entries // Public signature: /I.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: I#(){}kotlin.collections.MutableSet?>? - // Public signature: /I.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: I#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /I.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: I{}keys // Public signature: /I.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: I#(){}kotlin.collections.MutableSet? - // Public signature: /I.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: I#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /I.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: I{}size @@ -1509,12 +1509,12 @@ abstract class I : Java2, Java1 { // Mangled name: I{}values // Public signature: /I.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: I#(){}kotlin.collections.MutableCollection? - // Public signature: /I.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: I#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /I.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -1676,23 +1676,23 @@ abstract class J : Java2, Java1 { // Mangled name: J{}entries // Public signature: /J.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: J#(){}kotlin.collections.MutableSet?>? - // Public signature: /J.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: J#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /J.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: J{}keys // Public signature: /J.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: J#(){}kotlin.collections.MutableSet? - // Public signature: /J.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: J#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /J.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: J{}size @@ -1709,12 +1709,12 @@ abstract class J : Java2, Java1 { // Mangled name: J{}values // Public signature: /J.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: J#(){}kotlin.collections.MutableCollection? - // Public signature: /J.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: J#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /J.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -2580,23 +2580,23 @@ interface KotlinInterface2 : SortedMap { // Mangled name: KotlinInterface2{}entries // Public signature: /KotlinInterface2.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: KotlinInterface2#(){}kotlin.collections.MutableSet?>? - // Public signature: /KotlinInterface2.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: KotlinInterface2#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /KotlinInterface2.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: KotlinInterface2{}keys // Public signature: /KotlinInterface2.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: KotlinInterface2#(){}kotlin.collections.MutableSet? - // Public signature: /KotlinInterface2.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: KotlinInterface2#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /KotlinInterface2.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: KotlinInterface2{}size @@ -2613,12 +2613,12 @@ interface KotlinInterface2 : SortedMap { // Mangled name: KotlinInterface2{}values // Public signature: /KotlinInterface2.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: KotlinInterface2#(){}kotlin.collections.MutableCollection? - // Public signature: /KotlinInterface2.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: KotlinInterface2#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /KotlinInterface2.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -2779,3 +2779,4 @@ interface KotlinInterface3 : MutableMap { // Public signature: /test|-19437441252080184[0] // Public signature debug description: test(A;B;C;D;E;F;I;J;K;L;M;N){} fun test(a: A, b: B, c: C, d: D, e: E, f: F, i: I, j: J, k: K, l: L, m: M, n: N): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.ir.txt index 006f5d14b9d..65d86f0369b 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.ir.txt @@ -159,19 +159,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -183,24 +183,24 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B PROPERTY name:values visibility:public modality:OPEN [val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> FIELD PROPERTY_BACKING_FIELD name:values type:kotlin.collections.MutableCollection visibility:private [final] EXPRESSION_BODY GET_VAR 'values: kotlin.collections.MutableCollection declared in .B.' type=kotlin.collections.MutableCollection origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.B) returnType:kotlin.collections.MutableCollection correspondingProperty: PROPERTY name:values visibility:public modality:OPEN [val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:.B BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.collections.MutableCollection declared in .B' @@ -387,19 +387,19 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=true PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Boolean?, @[FlexibleNullability] kotlin.Boolean?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Boolean?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.sig.kt.txt index 49e79bc1546..5c58075c9c8 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJ.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : SortedMap { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet? - // Public signature: /A.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: A{}size @@ -183,12 +183,12 @@ abstract class A : SortedMap { // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection? - // Public signature: /A.values.|-410492473446277716[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|2965564880775457094[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -366,23 +366,23 @@ abstract class B : SortedMap { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|7599268606377074279[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|5073510598625478346[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|483538289598228229[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3437886487554544497[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet } @@ -391,3 +391,4 @@ abstract class B : SortedMap { // Public signature: /test|-2533013708701322011[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.ir.txt index de9966348f2..c55ef088957 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.ir.txt @@ -159,19 +159,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -183,11 +183,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[.Java1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B @@ -371,27 +371,27 @@ FILE fqName: fileName:/1.kt CONST Null type=kotlin.Nothing? value=null PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.Any?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Any?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Any?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.sig.kt.txt index 5bc8f2b32b2..87c8c6bdfc3 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/mapOverrideOnKJJ.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : Java1 { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|-6147764995888068019[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|4942816281630761189[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet? - // Public signature: /A.keys.|-3893665952060865409[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|8293422277479281384[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // 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 - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection? - // Public signature: /A.values.|-2463185466999264769[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|-2450585706206522502[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -355,34 +355,34 @@ abstract class B : Java1 { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|-6147764995888068019[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|4942816281630761189[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|-3893665952060865409[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - abstract /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|8293422277479281384[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection? - // Public signature: /B.values.|-2463185466999264769[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|-2450585706206522502[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -391,3 +391,4 @@ abstract class B : Java1 { // Public signature: /test|-2533013708701322011[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.ir.txt index 2c3e4b499fb..2f3acd22b5c 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.ir.txt @@ -161,19 +161,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.A> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.A> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -185,11 +185,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.Java1.A> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.A> CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[.Java1.B>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B.B> @@ -374,27 +374,27 @@ FILE fqName: fileName:/1.kt CONST Boolean type=kotlin.Boolean value=true PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.B> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.B> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.B> FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.sig.kt.txt index f0e97c07f04..6cca8250aca 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideKJJ.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : Java1 { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /A.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /A.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // 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 - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /A.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /A.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -361,34 +361,34 @@ abstract class B : Java1 { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /B.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /B.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /B.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /B.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -397,3 +397,4 @@ abstract class B : Java1 { // Public signature: /test|7309038897648133437[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.ir.txt index 3383d0a1018..383b0fce026 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.ir.txt @@ -161,19 +161,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .A?, @[FlexibleNullability] T of .A?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.A> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.A> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -185,11 +185,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.Java1.A> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.A>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .A?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.A> CLASS CLASS name:B modality:ABSTRACT visibility:public superTypes:[.Java1.B>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B.B> @@ -363,27 +363,27 @@ FILE fqName: fileName:/1.kt arg0: CONST Null type=kotlin.Nothing? value=null PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .B?, @[FlexibleNullability] T of .B?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .Java1?, @[FlexibleNullability] T of .Java1?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.B> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.B> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:.Java1.B>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .B?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?>? declared in .Java1 + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .Java1?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1.B> PROPERTY name:size visibility:public modality:OPEN [val] overridden: @@ -557,19 +557,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.KotlinClass, T of .KotlinClass>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .KotlinClass?, @[FlexibleNullability] T of .KotlinClass?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.KotlinClass, T of .KotlinClass>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .KotlinClass?, @[FlexibleNullability] T of .KotlinClass?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.KotlinClass, T of .KotlinClass> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.KotlinClass, T of .KotlinClass>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .KotlinClass?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.KotlinClass, T of .KotlinClass>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .KotlinClass?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.KotlinClass, T of .KotlinClass> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -581,11 +581,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap.KotlinClass, T of .KotlinClass> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.KotlinClass, T of .KotlinClass>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .KotlinClass?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.KotlinClass, T of .KotlinClass>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .KotlinClass?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.KotlinClass, T of .KotlinClass> FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.sig.kt.txt index 9bec91f8301..15920a105d4 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/substitutionMapOverrideOnKJKJ.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class A : Java1 { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /A.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /A.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // 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 - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /A.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /A.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -344,34 +344,34 @@ abstract class B : Java1 { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /B.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /B.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /B.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /B.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection // CHECK: // Mangled name: B{}size @@ -538,23 +538,23 @@ abstract class KotlinClass : SortedMap { // Mangled name: KotlinClass{}entries // Public signature: /KotlinClass.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet?>? - // Public signature: /KotlinClass.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /KotlinClass.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: KotlinClass{}keys // Public signature: /KotlinClass.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /KotlinClass.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: KotlinClass#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /KotlinClass.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: KotlinClass{}size @@ -571,12 +571,12 @@ abstract class KotlinClass : SortedMap { // Mangled name: KotlinClass{}values // Public signature: /KotlinClass.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: KotlinClass#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /KotlinClass.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: KotlinClass#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /KotlinClass.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -585,3 +585,4 @@ abstract class KotlinClass : SortedMap { // Public signature: /test|7309038897648133437[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.ir.txt index 29a19c75e4f..64b67682faf 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.ir.txt @@ -160,19 +160,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.C, T of .C>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .C?, @[FlexibleNullability] T of .C?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.C, T of .C>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .C?, @[FlexibleNullability] T of .C?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.C, T of .C> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.C, T of .C>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .C?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.C, T of .C>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .C?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.C, T of .C> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: @@ -184,11 +184,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.SortedMap.C, T of .C> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.C, T of .C>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .C?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.C, T of .C>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .C?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.C, T of .C> CLASS CLASS name:D modality:ABSTRACT visibility:public superTypes:[java.util.SortedMap.D, T of .D>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.D.D> @@ -370,27 +370,27 @@ FILE fqName: fileName:/1.kt CONST Null type=kotlin.Nothing? value=null PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract entries: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.D, T of .D>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .D?, @[FlexibleNullability] T of .D?>?>? [fake_override] + public abstract entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.D, T of .D>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] T of .D?, @[FlexibleNullability] T of .D?>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.SortedMap?, @[FlexibleNullability] V of java.util.SortedMap?>> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.D, T of .D> PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.D, T of .D>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .D?>? [fake_override] + public abstract keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.D, T of .D>) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] T of .D?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.D, T of .D> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.D, T of .D>) returnType:@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .D?>? [fake_override] + public abstract values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:java.util.SortedMap.D, T of .D>) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] T of .D?> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?>? declared in java.util.SortedMap + public abstract fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SortedMap?> declared in java.util.SortedMap $this: VALUE_PARAMETER name: type:java.util.SortedMap.D, T of .D> FUN name:test visibility:public modality:FINAL <> (c:.C, d:.D) returnType:kotlin.Unit VALUE_PARAMETER name:c index:0 type:.C diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.sig.kt.txt index c9f80f31360..93961413019 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/map/sunstitutionMapOverrideKJ.fir.sig.kt.txt @@ -150,23 +150,23 @@ abstract class C : SortedMap { // Mangled name: C{}entries // Public signature: /C.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.collections.MutableSet?>? - // Public signature: /C.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: C#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /C.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: C{}keys // Public signature: /C.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /C.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: C#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /C.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: C{}size @@ -183,12 +183,12 @@ abstract class C : SortedMap { // Mangled name: C{}values // Public signature: /C.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: C#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /C.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: C#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /C.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -355,34 +355,34 @@ abstract class D : SortedMap { // Mangled name: D{}entries // Public signature: /D.entries|-586096469347622282[0] // Public signature debug description: {}entries - abstract /* fake */ override val entries: MutableSet?>? + abstract /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.collections.MutableSet?>? - // Public signature: /D.entries.|2209330178150314733[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - abstract /* fake */ override get(): MutableSet?>? + // Mangled name: D#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /D.entries.|-3651740414273962157[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry> // CHECK: // Mangled name: D{}keys // Public signature: /D.keys|-1539062068328255324[0] // Public signature debug description: {}keys - abstract /* fake */ override val keys: MutableSet? + abstract /* fake */ override val keys: @EnhancedNullability MutableSet // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.collections.MutableSet<1:0?>? - // Public signature: /D.keys.|-1655820107680360252[0] - // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>? - abstract /* fake */ override get(): MutableSet? + // Mangled name: D#(){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + // Public signature: /D.keys.|649304329200166856[0] + // Public signature debug description: (){}kotlin.collections.MutableSet<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableSet // CHECK: // Mangled name: D{}values // Public signature: /D.values|-764749005844117249[0] // Public signature debug description: {}values - abstract /* fake */ override val values: MutableCollection? + abstract /* fake */ override val values: @EnhancedNullability MutableCollection // CHECK JVM_IR: - // Mangled name: D#(){}kotlin.collections.MutableCollection<1:0?>? - // Public signature: /D.values.|-2076746461707851648[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>? - abstract /* fake */ override get(): MutableCollection? + // Mangled name: D#(){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + // Public signature: /D.values.|-4281354652209631610[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection<1:0?>{EnhancedNullability} + abstract /* fake */ override get(): @EnhancedNullability MutableCollection } @@ -391,3 +391,4 @@ abstract class D : SortedMap { // Public signature: /test|-4299498337034679333[0] // Public signature debug description: test(C;D){} fun test(c: C, d: D): Unit + diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.ir.txt index 100cdb6b590..19d6f06517c 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.ir.txt @@ -129,19 +129,19 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: 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: visibility:public modality:OPEN <> ($this:.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: visibility:public modality:OPEN <> ($this:.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 (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>? declared in .Java1 + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.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: visibility:public modality:OPEN <> ($this:.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: visibility:public modality:OPEN <> ($this:.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 (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>? declared in .Java1 + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: @@ -153,11 +153,11 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:.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: visibility:public modality:OPEN <> ($this:.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: visibility:public modality:OPEN <> ($this:.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 (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>? declared in .Java1 + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 CLASS CLASS name:B modality:FINAL visibility:public superTypes:[.Java1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B @@ -311,27 +311,27 @@ FILE fqName: 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: visibility:public modality:OPEN <> ($this:.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: visibility:public modality:OPEN <> ($this:.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 (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] java.lang.Void?, @[FlexibleNullability] java.lang.Void?>?>? declared in .Java1 + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?, @[EnhancedNullability] @[FlexibleNullability] java.lang.Void?>> declared in .Java1 $this: VALUE_PARAMETER name: type:.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: visibility:public modality:OPEN <> ($this:.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: visibility:public modality:OPEN <> ($this:.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 (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] java.lang.Void?>? declared in .Java1 + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in .Java1 $this: VALUE_PARAMETER name: type:.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: visibility:public modality:OPEN <> ($this:.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: visibility:public modality:OPEN <> ($this:.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 (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] java.lang.Void?>? declared in .Java1 + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[FlexibleNullability] java.lang.Void?> declared in .Java1 $this: VALUE_PARAMETER name: type:.Java1 FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A diff --git a/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.sig.kt.txt index 238f71ec67d..c5c14c68ae2 100644 --- a/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/collections/set/setOverrideKJJ.fir.sig.kt.txt @@ -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?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Void?, @EnhancedNullability Void?>> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet?>? - // Public signature: /A.entries.|-6070695281271194003[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|-1449002387372962939[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{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? + /* fake */ override val keys: @EnhancedNullability MutableSet<@EnhancedNullability Void?> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet? - // Public signature: /A.keys.|6556245738399573293[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|6266223291892564583[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{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? + /* fake */ override val values: @EnhancedNullability MutableCollection<@EnhancedNullability Void?> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection? - // Public signature: /A.values.|3365463410528719249[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|-4884439515124608116[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{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?>? + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Void?, @EnhancedNullability Void?>> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet?>? - // Public signature: /B.entries.|-6070695281271194003[0] - // Public signature debug description: (){}kotlin.collections.MutableSet?>? - /* fake */ override get(): MutableSet?>? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|-1449002387372962939[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{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? + /* fake */ override val keys: @EnhancedNullability MutableSet<@EnhancedNullability Void?> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet? - // Public signature: /B.keys.|6556245738399573293[0] - // Public signature debug description: (){}kotlin.collections.MutableSet? - /* fake */ override get(): MutableSet? + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|6266223291892564583[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{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? + /* fake */ override val values: @EnhancedNullability MutableCollection<@EnhancedNullability Void?> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection? - // Public signature: /B.values.|3365463410528719249[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection? - /* fake */ override get(): MutableCollection? + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|-4884439515124608116[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{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 + diff --git a/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.ir.txt index f529e7a50f8..7221c0f8120 100644 --- a/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.ir.txt @@ -203,24 +203,24 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.AbstractMap<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.Int?> 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] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> public abstract entries: kotlin.collections.MutableSet> - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SequencedMap) returnType:kotlin.collections.MutableSet> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.HashMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] kotlin.Int, @[EnhancedNullability] kotlin.Int>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap public abstract fun (): kotlin.collections.MutableSet> declared in java.util.SequencedMap - $this: VALUE_PARAMETER name: type:java.util.SequencedMap + $this: VALUE_PARAMETER name: type:java.util.HashMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> public abstract keys: kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SequencedMap?> - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SequencedMap) returnType:kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Int?> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.HashMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.Int> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap public abstract fun (): kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SequencedMap?> declared in java.util.SequencedMap - $this: VALUE_PARAMETER name: type:java.util.SequencedMap + $this: VALUE_PARAMETER name: type:java.util.HashMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: public open size: kotlin.Int @@ -233,14 +233,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.HashMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> public abstract values: kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SequencedMap?> - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SequencedMap) returnType:kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Int?> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.HashMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] kotlin.Int> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap public abstract fun (): kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SequencedMap?> declared in java.util.SequencedMap - $this: VALUE_PARAMETER name: type:java.util.SequencedMap + $this: VALUE_PARAMETER name: type:java.util.HashMap CLASS CLASS name:B modality:FINAL visibility:public superTypes:[java.util.HashMap; java.util.SequencedMap] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B CONSTRUCTOR visibility:public <> () returnType:.B [primary] @@ -450,24 +450,24 @@ FILE fqName: fileName:/1.kt arg0: 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] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? + public open entries: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> public abstract entries: kotlin.collections.MutableSet> - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SequencedMap) returnType:kotlin.collections.MutableSet> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.HashMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] kotlin.Int, @[EnhancedNullability] kotlin.Int>> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:entries visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap.MutableEntry<@[FlexibleNullability] K of java.util.HashMap?, @[FlexibleNullability] V of java.util.HashMap?>?>? declared in java.util.HashMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.collections.MutableMap.MutableEntry<@[EnhancedNullability] K of java.util.HashMap, @[EnhancedNullability] V of java.util.HashMap>> declared in java.util.HashMap public abstract fun (): kotlin.collections.MutableSet> declared in java.util.SequencedMap - $this: VALUE_PARAMETER name: type:java.util.SequencedMap + $this: VALUE_PARAMETER name: type:java.util.HashMap PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public open keys: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? + public open keys: @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> public abstract keys: kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SequencedMap?> - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SequencedMap) returnType:kotlin.collections.MutableSet<@[FlexibleNullability] kotlin.Int?> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.HashMap) returnType:@[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.Int> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.HashMap?>? declared in java.util.HashMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableSet<@[EnhancedNullability] K of java.util.HashMap> declared in java.util.HashMap public abstract fun (): kotlin.collections.MutableSet<@[FlexibleNullability] K of java.util.SequencedMap?> declared in java.util.SequencedMap - $this: VALUE_PARAMETER name: type:java.util.SequencedMap + $this: VALUE_PARAMETER name: type:java.util.HashMap PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: public open size: kotlin.Int @@ -480,14 +480,14 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:java.util.HashMap PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public open values: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? + public open values: @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> public abstract values: kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SequencedMap?> - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.SequencedMap) returnType:kotlin.collections.MutableCollection<@[FlexibleNullability] kotlin.Int?> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.HashMap) returnType:@[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] kotlin.Int> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: - public open fun (): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.HashMap?>? declared in java.util.HashMap + public open fun (): @[EnhancedNullability] kotlin.collections.MutableCollection<@[EnhancedNullability] V of java.util.HashMap> declared in java.util.HashMap public abstract fun (): kotlin.collections.MutableCollection<@[FlexibleNullability] V of java.util.SequencedMap?> declared in java.util.SequencedMap - $this: VALUE_PARAMETER name: type:java.util.SequencedMap + $this: VALUE_PARAMETER name: type:java.util.HashMap FUN name:test visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A VALUE_PARAMETER name:b index:1 type:.B diff --git a/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.sig.kt.txt index 9fe1b421d36..58d6f69d6f9 100644 --- a/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/java21/sequenceMapIntersectionOverrideKJJ.fir.sig.kt.txt @@ -210,23 +210,23 @@ abstract class A : HashMap, SequencedMap { // Mangled name: A{}entries // Public signature: /A.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet> + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Int, @EnhancedNullability Int>> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet> - // Public signature: /A.entries.|1692716713642529615[0] - // Public signature debug description: (){}kotlin.collections.MutableSet> - /* fake */ override get(): MutableSet> + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /A.entries.|-6784228018896218890[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Int, @EnhancedNullability Int>> // CHECK: // Mangled name: A{}keys // Public signature: /A.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet + /* fake */ override val keys: @EnhancedNullability MutableSet<@EnhancedNullability Int> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableSet - // Public signature: /A.keys.|198765053730638131[0] - // Public signature debug description: (){}kotlin.collections.MutableSet - /* fake */ override get(): MutableSet + // Mangled name: A#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /A.keys.|-3100522392016272266[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability Int> // CHECK: // Mangled name: A{}size @@ -243,12 +243,12 @@ abstract class A : HashMap, SequencedMap { // Mangled name: A{}values // Public signature: /A.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection + /* fake */ override val values: @EnhancedNullability MutableCollection<@EnhancedNullability Int> // CHECK JVM_IR: - // Mangled name: A#(){}kotlin.collections.MutableCollection - // Public signature: /A.values.|6778780144264802127[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection - /* fake */ override get(): MutableCollection + // Mangled name: A#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /A.values.|301862012344866451[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection<@EnhancedNullability Int> } @@ -464,23 +464,23 @@ class B : HashMap, SequencedMap { // Mangled name: B{}entries // Public signature: /B.entries|-586096469347622282[0] // Public signature debug description: {}entries - /* fake */ override val entries: MutableSet> + /* fake */ override val entries: @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Int, @EnhancedNullability Int>> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet> - // Public signature: /B.entries.|1692716713642529615[0] - // Public signature debug description: (){}kotlin.collections.MutableSet> - /* fake */ override get(): MutableSet> + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + // Public signature: /B.entries.|-6784228018896218890[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability}>{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability MutableEntry<@EnhancedNullability Int, @EnhancedNullability Int>> // CHECK: // Mangled name: B{}keys // Public signature: /B.keys|-1539062068328255324[0] // Public signature debug description: {}keys - /* fake */ override val keys: MutableSet + /* fake */ override val keys: @EnhancedNullability MutableSet<@EnhancedNullability Int> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableSet - // Public signature: /B.keys.|198765053730638131[0] - // Public signature debug description: (){}kotlin.collections.MutableSet - /* fake */ override get(): MutableSet + // Mangled name: B#(){}kotlin.collections.MutableSet{EnhancedNullability} + // Public signature: /B.keys.|-3100522392016272266[0] + // Public signature debug description: (){}kotlin.collections.MutableSet{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableSet<@EnhancedNullability Int> // CHECK: // Mangled name: B{}size @@ -497,12 +497,12 @@ class B : HashMap, SequencedMap { // Mangled name: B{}values // Public signature: /B.values|-764749005844117249[0] // Public signature debug description: {}values - /* fake */ override val values: MutableCollection + /* fake */ override val values: @EnhancedNullability MutableCollection<@EnhancedNullability Int> // CHECK JVM_IR: - // Mangled name: B#(){}kotlin.collections.MutableCollection - // Public signature: /B.values.|6778780144264802127[0] - // Public signature debug description: (){}kotlin.collections.MutableCollection - /* fake */ override get(): MutableCollection + // Mangled name: B#(){}kotlin.collections.MutableCollection{EnhancedNullability} + // Public signature: /B.values.|301862012344866451[0] + // Public signature debug description: (){}kotlin.collections.MutableCollection{EnhancedNullability} + /* fake */ override get(): @EnhancedNullability MutableCollection<@EnhancedNullability Int> } @@ -511,3 +511,4 @@ class B : HashMap, SequencedMap { // Public signature: /test|-2533013708701322011[0] // Public signature debug description: test(A;B){} fun test(a: A, b: B): Unit + diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index e80e1b423f0..dfdc007a9d2 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -22588,6 +22588,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/j+k/kt60580.kt"); } + @Test + @TestMetadata("kt62118.kt") + public void testKt62118() { + runTest("compiler/testData/diagnostics/tests/j+k/kt62118.kt"); + } + @Test @TestMetadata("kt62197.kt") public void testKt62197() {