[FIR] Render nullability in type renderer, not in fir renderer

compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir.types
 
 fun ConeKotlinType.render(): String {
+    val nullabilitySuffix = if (this !is ConeKotlinErrorType && this !is ConeClassErrorType) nullability.suffix else ""
     return when (this) {
         is ConeTypeVariableType -> "TypeVariable(${this.lookupTag.name})"
         is ConeDefinitelyNotNullType -> "${original.render()}!"
@@ -33,12 +34,10 @@ fun ConeKotlinType.render(): String {
             buildString {
                 append("ft<")
                 append(lowerBound.render())
-                append(lowerBound.nullability.suffix)
                 append(", ")
                 append(upperBound.render())
-                append(upperBound.nullability.suffix)
                 append(">")
             }
         }
-    }
+    } + nullabilitySuffix
 }

compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt

@@ -1,5 +1,5 @@
 public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -55,7 +55,7 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges/ClosedRange<kotlin/Char>| {
     public open operator fun contains(value: R|kotlin/Char|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -95,7 +95,7 @@ public abstract interface ClosedRange<T> : R|kotlin/Any| {
 }
 
 public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -151,7 +151,7 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/ClosedRange<kotlin/Int>| {
     public open operator fun contains(value: R|kotlin/Int|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -178,7 +178,7 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 }
 
 public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -234,7 +234,7 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges/ClosedRange<kotlin/Long>| {
     public open operator fun contains(value: R|kotlin/Long|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/builtIns/kotlin.txt

@@ -24,15 +24,15 @@ public final fun longArrayOf(vararg elements: R|kotlin/LongArray|): R|kotlin/Lon
 
 public final fun shortArrayOf(vararg elements: R|kotlin/ShortArray|): R|kotlin/ShortArray|
 
-public final operator fun R|kotlin/String|?.plus(other: R|kotlin/Any|?): R|kotlin/String|
+public final operator fun R|kotlin/String?|.plus(other: R|kotlin/Any?|): R|kotlin/String|
 
-public final fun R|kotlin/Any|?.toString(): R|kotlin/String|
+public final fun R|kotlin/Any?|.toString(): R|kotlin/String|
 
 public abstract interface Annotation : R|kotlin/Any| {
 }
 
 public open class Any {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -533,7 +533,7 @@ public abstract class Enum<E> : R|kotlin/Comparable<E>| {
 
     public final operator fun compareTo(other: R|E|): R|kotlin/Int|
 
-    public final operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public final operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public final fun hashCode(): R|kotlin/Int|
 
@@ -1254,7 +1254,7 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open operator fun get(index: R|kotlin/Int|): R|kotlin/Char|
 
-    public final operator fun plus(other: R|kotlin/Any|?): R|kotlin/String|
+    public final operator fun plus(other: R|kotlin/Any?|): R|kotlin/String|
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
@@ -1279,19 +1279,19 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 }
 
 public open class Throwable : R|kotlin/Any| {
-    public open val cause: R|kotlin/Throwable|?
-        public get(): R|kotlin/Throwable|?
+    public open val cause: R|kotlin/Throwable?|
+        public get(): R|kotlin/Throwable?|
 
-    public open val message: R|kotlin/String|?
-        public get(): R|kotlin/String|?
+    public open val message: R|kotlin/String?|
+        public get(): R|kotlin/String?|
 
-    public constructor(message: R|kotlin/String|?): R|kotlin/Throwable|
+    public constructor(message: R|kotlin/String?|): R|kotlin/Throwable|
 
-    public constructor(cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
+    public constructor(cause: R|kotlin/Throwable?|): R|kotlin/Throwable|
 
     public constructor(): R|kotlin/Throwable|
 
-    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
+    public constructor(message: R|kotlin/String?|, cause: R|kotlin/Throwable?|): R|kotlin/Throwable|
 
 }
 

compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt

@@ -1,9 +1,9 @@
 @R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class MyNullable : R|kotlin/Annotation| {
 }
 public open class NonNullNever : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String?|
 
-    @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String|?, @R|MyNullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
     public constructor(): R|NonNullNever|
 

compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt

@@ -1,7 +1,7 @@
 public open class Simple : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 

compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt

@@ -1,7 +1,7 @@
 public open class Strange : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>|!
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt

@@ -1,9 +1,9 @@
 @R|FieldsAreNullable|() public open class A : R|kotlin/Any| {
-    public open field field: R|kotlin/String|?
+    public open field field: R|kotlin/String?|
 
     @R|javax/annotation/Nonnull|() public open field nonNullField: R|kotlin/String|
 
-    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt

@@ -1,7 +1,7 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String|
 
-    @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|!
+    @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt

@@ -5,7 +5,7 @@
 
     public open operator fun baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt

@@ -5,9 +5,9 @@
 
     public open operator fun foo3(x: R|kotlin/String|): R|kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
     public open operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
@@ -21,9 +21,9 @@
 
     public abstract operator fun foo3(x: R|kotlin/String|): R|kotlin/CharSequence|
 
-    @R|javax/annotation/Nullable|() public abstract operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
+    @R|javax/annotation/Nullable|() public abstract operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
 
-    @R|javax/annotation/Nullable|() public abstract operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
+    @R|javax/annotation/Nullable|() public abstract operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
 
     public abstract operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence|
 
@@ -33,7 +33,7 @@
 
     @R|javax/annotation/Nonnull|() public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator fun bar1(x: R|kotlin/String|?): R|kotlin/String|?
+    public open operator fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
 
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
@@ -45,9 +45,9 @@
 
     public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator fun bar1(x: R|kotlin/String|?): R|kotlin/String|?
+    public open operator fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt

@@ -1,13 +1,13 @@
 @R|NonNullApi|() public open class A : R|kotlin/Any| {
     public open field field: R|kotlin/String|
 
-    public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String|
 
-    @R|NullableApi|() public open operator fun foobar(x: R|kotlin/String|?, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String|?
+    @R|NullableApi|() public open operator fun foobar(x: R|kotlin/String?|, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String?|
 
     public open operator fun bar(): R|kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
+    @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt

@@ -1,7 +1,7 @@
 @R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt

@@ -1,7 +1,7 @@
 public open class A : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
@@ -9,9 +9,9 @@ public open class A : R|kotlin/Any| {
 
 }
 public open class A2 : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt

@@ -1,11 +1,11 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>|!
+    public open field field: R|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String|
 
     public open operator fun bar(): R|kotlin/String|
 
-    @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
+    @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt

@@ -1,11 +1,11 @@
 public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>|!
+    public open field field: R|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun foo(x: R|ft<kotlin/String, kotlin/String?>|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(x: R|ft<kotlin/String, kotlin/String?>!|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun bar(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun bar(): R|ft<kotlin/String, kotlin/String?>!|
 
-    @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
+    @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|test/A|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt

@@ -1,24 +1,24 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>|! = R|/Signs.HELLO|): R|ft<Signs, Signs?>|!
+    public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>!| = R|/Signs.HELLO|): R|ft<Signs, Signs?>!|
 
-    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>|! = R|/Signs.X|): R|ft<Signs, Signs?>|!
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>!| = R|/Signs.X|): R|ft<Signs, Signs?>!|
 
-    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>|!): R|ft<Signs, Signs?>|!
+    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>!|): R|ft<Signs, Signs?>!|
 
-    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>!| = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>!|
 
     public/*package*/ constructor(): R|A|
 
 }
 public final enum class Mixed : R|kotlin/Enum<Mixed>| {
-    public final static field NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
+    public final static field NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>!|
 
 }
 public final enum class Signs : R|kotlin/Enum<Signs>| {
-    public final static field HELLO: R|ft<Signs, Signs?>|!
+    public final static field HELLO: R|ft<Signs, Signs?>!|
 
-    public final static field WORLD: R|ft<Signs, Signs?>|!
+    public final static field WORLD: R|ft<Signs, Signs?>!|
 
-    public final static field X: R|ft<Signs, Signs?>|!
+    public final static field X: R|ft<Signs, Signs?>!|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt

@@ -1,23 +1,23 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
 
-    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
 
-    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
 
-    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
+    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public open class B : R|kotlin/Any| {
-    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
     public constructor(): R|B|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt

@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
@@ -7,7 +7,7 @@ public open class A : R|kotlin/Any| {
 
 }
 public open class B<T> : R|kotlin/Any| {
-    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>!| = Null(null)): R|kotlin/Unit|
 
     public constructor<T>(): R|B<T>|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt

@@ -1,27 +1,27 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public abstract interface AInt : R|kotlin/Any| {
-    public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
-    public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
 }
 public open class B : R|A| {
-    public open operator fun foo(i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
+    public open operator fun foo(i: R|ft<kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
 
-    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
-    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
     public constructor(): R|B|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt

@@ -1,13 +1,13 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>|! = String(hello)): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>!| = String(hello)): R|kotlin/Unit|
 
-    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>!| = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
 
-    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), b: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>!| = String(first), b: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open operator fun fourth(first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
+    public open operator fun fourth(first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
 
-    public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
+    public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt

@@ -1,9 +1,9 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt

@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt

@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt

@@ -1,7 +1,7 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt

@@ -1,5 +1,5 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
+    public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>!| = String(OK)): R|ft<kotlin/String, kotlin/String?>!|
 
     public/*package*/ constructor(): R|A|
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -29,7 +29,7 @@ public final class Test : R|kotlin/Any| {
 }
 
 public final inline class Z : R|kotlin/Any| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt

@@ -1,5 +1,5 @@
 public final inline class Z : R|kotlin/Any| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt

@@ -3,7 +3,7 @@ public final data class My : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/Int| = STUB): R|test/My|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt

@@ -12,7 +12,7 @@ public final class Class : R|kotlin/Any| {
 }
 
 public final class CustomDelegate : R|kotlin/Any| {
-    public final operator fun getValue(thisRef: R|kotlin/Any|?, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
+    public final operator fun getValue(thisRef: R|kotlin/Any?|, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
 
     public constructor(): R|test/CustomDelegate|
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt

@@ -1,4 +1,4 @@
 public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test/EnumWithGenericConstructorParameter>| {
-    private constructor(list: R|kotlin/collections/List<kotlin/String>|?): R|test/EnumWithGenericConstructorParameter|
+    private constructor(list: R|kotlin/collections/List<kotlin/String>?|): R|test/EnumWithGenericConstructorParameter|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt

@@ -1,7 +1,7 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
     public open fun getSomething(): R|kotlin/Int|
 
-    public open fun setSomething(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun setSomething(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/DifferentGetterAndSetter|
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt

@@ -1,5 +1,5 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|kotlin/String|?
+    public open fun getColor(): R|kotlin/String?|
 
     public constructor(): R|test/JavaBeanVal|
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt

@@ -1,7 +1,7 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|kotlin/String|?
+    public open fun getColor(): R|kotlin/String?|
 
-    public open fun setColor(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun setColor(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/JavaBeanVar|
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt

@@ -1,7 +1,7 @@
 public open class JavaBeanVarOfGenericType<P> : R|kotlin/Any| {
-    public open fun getCharacters(): R|java/util/ArrayList<P>|?
+    public open fun getCharacters(): R|java/util/ArrayList<P>?|
 
-    public open fun setCharacters(p0: R|java/util/ArrayList<P>|?): R|kotlin/Unit|
+    public open fun setCharacters(p0: R|java/util/ArrayList<P>?|): R|kotlin/Unit|
 
     public constructor<P>(): R|test/JavaBeanVarOfGenericType<P>|
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt

@@ -1,7 +1,7 @@
 public open class TwoSetters : R|kotlin/Any| {
     public open fun setSize(p0: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open fun setSize(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun setSize(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/TwoSetters|
 

compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor(p0: R|java/lang/Class<kotlin/Any>|?): R|test/ConstructorGenericDeep|
+    public constructor(p0: R|java/lang/Class<kotlin/Any?>?|): R|test/ConstructorGenericDeep|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor(p0: R|kotlin/Any|?): R|test/ConstructorGenericSimple|
+    public constructor(p0: R|kotlin/Any?|): R|test/ConstructorGenericSimple|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor(p0: R|java/util/RandomAccess|?): R|test/ConstructorGenericUpperBound|
+    public constructor(p0: R|java/util/RandomAccess?|): R|test/ConstructorGenericUpperBound|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt

@@ -5,7 +5,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB, z: R|kotlin/Double| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt

@@ -3,7 +3,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt

@@ -5,7 +5,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB, y: R|kotlin/Int| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt

@@ -5,7 +5,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB, y: R|kotlin/Int| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt

@@ -1,5 +1,5 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>|?): R|kotlin/Array<kotlin/Any>|?
+    public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>?|): R|kotlin/Array<kotlin/Any>?|
 
     public constructor(): R|test/ArrayTypeVariance|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt

@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|kotlin/collections/Iterable<P>|?, P> : R|kotlin/Any| {
-    public constructor<R : R|kotlin/collections/Iterable<P>|?, P>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|kotlin/collections/Iterable<P>?|, P> : R|kotlin/Any| {
+    public constructor<R : R|kotlin/collections/Iterable<P>?|, P>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|?> : R|kotlin/Any| {
-    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>|?>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>?|> : R|kotlin/Any| {
+    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>?|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt

@@ -1,7 +1,7 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public final var files: R|kotlin/Array<java/io/File>|?
-        public get(): R|kotlin/Array<java/io/File>|?
-        public set(value: R|kotlin/Array<java/io/File>|?): kotlin/Unit
+    public final var files: R|kotlin/Array<java/io/File>?|
+        public get(): R|kotlin/Array<java/io/File>?|
+        public set(value: R|kotlin/Array<java/io/File>?|): kotlin/Unit
 
     public constructor(): R|test/FieldOfArrayType|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt

@@ -5,16 +5,16 @@ public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
     }
 
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun bar(): R|kotlin/String|?
+        public abstract fun bar(): R|kotlin/String?|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun bar(): R|kotlin/CharSequence|?
+        public abstract fun bar(): R|kotlin/CharSequence?|
 
-        public abstract fun foo(): R|kotlin/String|?
+        public abstract fun foo(): R|kotlin/String?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt

@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open fun <T : R|kotlin/Cloneable|?> bar(): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Cloneable?|> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt

@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open fun <T : R|kotlin/Cloneable|?, R|java/lang/Runnable|?> foo(): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Cloneable?|, R|java/lang/Runnable?|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt

@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(p0: R|kotlin/String|?, p1: R|kotlin/Throwable|?): R|test/MyException|
+    public constructor(p0: R|kotlin/String?|, p1: R|kotlin/Throwable?|): R|test/MyException|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt

@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(p0: R|kotlin/Comparable<kotlin/CharSequence>|?): R|kotlin/Unit|
+    public abstract fun f(p0: R|kotlin/Comparable<kotlin/CharSequence?>?|): R|kotlin/Unit|
 
-    public abstract fun f(p0: R|kotlin/collections/Collection<kotlin/CharSequence>|?): R|kotlin/Unit|
+    public abstract fun f(p0: R|kotlin/collections/Collection<kotlin/CharSequence?>?|): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt

@@ -1,9 +1,9 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public final fun foo(): R|test/UnboundWildcard.MyClass<*>|?
+    public final fun foo(): R|test/UnboundWildcard.MyClass<*>?|
 
     public constructor(): R|test/UnboundWildcard|
 
-    public abstract interface MyClass<T : R|kotlin/CharSequence|?> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
     }
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt

@@ -1,5 +1,5 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|kotlin/Function1<kotlin/String, kotlin/String>|): @R|kotlin/ExtensionFunctionType|() R|kotlin/Function1<kotlin/String, kotlin/String>|?
+    public open fun foo(f: R|kotlin/Function1<kotlin/String?, kotlin/String>|): @R|kotlin/ExtensionFunctionType|() R|kotlin/Function1<kotlin/String, kotlin/String?>?|
 
     public constructor(): R|test/MethodWithFunctionTypes|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt

@@ -1,5 +1,5 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
-    public open fun foo(a: R|kotlin/String|, b: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
+    public open fun foo(a: R|kotlin/String|, b: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String?, kotlin/String>?>|): R|kotlin/String|
 
     public constructor(): R|test/MethodWithGenerics|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt

@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/List<kotlin/Cloneable>|> foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String>|): R|kotlin/Unit|
+    public open fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/List<kotlin/Cloneable>|> foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt

@@ -3,9 +3,9 @@ public open class PropertySimpleType : R|kotlin/Any| {
         public get(): R|kotlin/String|
         public set(value: R|kotlin/String|): kotlin/Unit
 
-    public final var fieldTwo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var fieldTwo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/PropertySimpleType|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt

@@ -3,7 +3,7 @@ public final class StarProjection : R|kotlin/Any| {
 
     public constructor(): R|test/StarProjection|
 
-    public abstract interface MyClass<T : R|kotlin/CharSequence|?> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
     }
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt

@@ -1,5 +1,5 @@
 public open class ConflictingProjectionKind : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>|?): R|kotlin/Unit|
+    public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>?|): R|kotlin/Unit|
 
     public constructor(): R|test/ConflictingProjectionKind|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt

@@ -1,7 +1,7 @@
 public open class ExplicitFieldGettersAndSetters : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/ExplicitFieldGettersAndSetters|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt

@@ -1,5 +1,5 @@
 public open class ExtraUpperBound : R|kotlin/Any| {
-    public open fun <A : R|java/lang/Runnable|?> foo(): R|kotlin/String|?
+    public open fun <A : R|java/lang/Runnable?|> foo(): R|kotlin/String?|
 
     public constructor(): R|test/ExtraUpperBound|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt

@@ -1,5 +1,5 @@
 public open class MissingUpperBound : R|kotlin/Any| {
-    public open fun <A : R|java/lang/Runnable|?, R|kotlin/Cloneable|?> foo(): R|kotlin/String|?
+    public open fun <A : R|java/lang/Runnable?|, R|kotlin/Cloneable?|> foo(): R|kotlin/String?|
 
     public constructor(): R|test/MissingUpperBound|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt

@@ -1,7 +1,7 @@
 public open class NoFieldTypeRef : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/NoFieldTypeRef|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt

@@ -1,5 +1,5 @@
 public open class NotVarargReplacedWithVararg : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/NotVarargReplacedWithVararg|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt

@@ -1,5 +1,5 @@
 public open class ReturnTypeMissing : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/Int|
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/Int|
 
     public constructor(): R|test/ReturnTypeMissing|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt

@@ -1,5 +1,5 @@
 public open class SyntaxError : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/Int|?
+    public open fun foo(): R|kotlin/Int?|
 
     public constructor(): R|test/SyntaxError|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt

@@ -1,7 +1,7 @@
 public open class SyntaxErrorInFieldAnnotation : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/SyntaxErrorInFieldAnnotation|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt

@@ -1,5 +1,5 @@
 public open class VarargReplacedWithNotVararg : R|kotlin/Any| {
-    public open fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+    public open fun foo(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargReplacedWithNotVararg|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt

@@ -1,7 +1,7 @@
 public open class WrongFieldInitializer : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/WrongFieldInitializer|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt

@@ -1,10 +1,10 @@
 public open class WrongFieldMutability : R|kotlin/Any| {
-    public final val fooFinal: R|kotlin/String|?
-        public get(): R|kotlin/String|?
+    public final val fooFinal: R|kotlin/String?|
+        public get(): R|kotlin/String?|
 
-    public final var fooNotFinal: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var fooNotFinal: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/WrongFieldMutability|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt

@@ -1,7 +1,7 @@
 public open class WrongFieldName : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/WrongFieldName|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt

@@ -1,5 +1,5 @@
 public open class WrongMethodName : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/String|?
+    public open fun foo(): R|kotlin/String?|
 
     public constructor(): R|test/WrongMethodName|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt

@@ -1,5 +1,5 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(p0: R|kotlin/Array<out kotlin/Number>|?, p1: R|kotlin/Array<out kotlin/Number>|?): R|kotlin/collections/MutableList<kotlin/Number>|?
+    public open fun copy(p0: R|kotlin/Array<out kotlin/Number>?|, p1: R|kotlin/Array<out kotlin/Number>?|): R|kotlin/collections/MutableList<kotlin/Number>?|
 
     public constructor(): R|test/WrongProjectionKind|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt

@@ -1,5 +1,5 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongReturnTypeStructure|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeName1 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongTypeName1|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeName2 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongTypeName2|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeName3 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongTypeName3|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open fun <A, B : R|java/lang/Runnable|?, R|kotlin/collections/List<kotlin/Cloneable>|?> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure2 : R|kotlin/Any| {
-    public open fun <A, B : R|java/lang/Runnable|?, R|kotlin/collections/List<kotlin/Cloneable>|?> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure2|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeParametersCount : R|kotlin/Any| {
-    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParametersCount|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt

@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongValueParameterStructure1|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt

@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure2 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongValueParameterStructure2|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt

@@ -1,5 +1,5 @@
 public open class WrongValueParametersCount : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/Int|?
+    public open fun foo(): R|kotlin/Int?|
 
     public constructor(): R|test/WrongValueParametersCount|
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt

@@ -1,31 +1,31 @@
 public abstract interface PropagateTypeArgumentNullable : R|kotlin/Any| {
     public abstract interface Sub : R|test/PropagateTypeArgumentNullable.Super| {
-        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|
+        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|
 
-        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String>|
+        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String?>|
 
-        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun outR(): R|kotlin/collections/List<kotlin/String?>|
 
-        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String?>|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|
+        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|
 
-        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String>|
+        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String?>|
 
-        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun outR(): R|kotlin/collections/List<kotlin/String?>|
 
-        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String?>|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt

@@ -1,13 +1,13 @@
 public abstract interface InheritNotVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVararg.Super| {
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>?|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt

@@ -1,13 +1,13 @@
 public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>?|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt

@@ -1,13 +1,13 @@
 public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
-        public abstract fun foo(p0: R|kotlin/IntArray|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/IntArray?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/IntArray|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/IntArray?|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt

@@ -1,13 +1,13 @@
 public abstract interface InheritVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVararg.Super| {
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt

@@ -1,13 +1,13 @@
 public abstract interface InheritVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargInteger.Super| {
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int?>|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int?>|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt

@@ -2,12 +2,12 @@ public abstract interface Kt3302 : R|kotlin/Any| {
     public abstract interface BSONObject : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun put(p0: R|kotlin/String|, p1: R|kotlin/Any|): R|kotlin/Any|?
+        public abstract fun put(p0: R|kotlin/String|, p1: R|kotlin/Any|): R|kotlin/Any?|
 
     }
 
     public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<kotlin/String, kotlin/Any>|, R|test/Kt3302.BSONObject| {
-        public abstract fun put(key: R|kotlin/String|, value: R|kotlin/Any|): R|kotlin/Any|?
+        public abstract fun put(key: R|kotlin/String|, value: R|kotlin/Any|): R|kotlin/Any?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt

@@ -1,13 +1,13 @@
 public abstract interface NullableToNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNull.Super| {
-        public abstract fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt

@@ -1,13 +1,13 @@
 public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNullKotlinSignature.Super| {
-        public abstract fun foo(p: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt

@@ -7,7 +7,7 @@ public abstract interface AddNotNullJavaSubtype : R|kotlin/Any| {
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt

@@ -7,7 +7,7 @@ public abstract interface AddNotNullSameJavaType : R|kotlin/Any| {
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt

@@ -1,13 +1,13 @@
 public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
     public abstract interface Sub : R|test/HalfSubstitutedTypeParameters.Super| {
-        public abstract fun foo(): R|test/HalfSubstitutedTypeParameters.TrickyList<kotlin/Int, kotlin/String>|
+        public abstract fun foo(): R|test/HalfSubstitutedTypeParameters.TrickyList<kotlin/Int, kotlin/String?>|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/MutableList<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/MutableList<kotlin/String?>|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt

@@ -1,13 +1,13 @@
 public abstract interface SameProjectionKind : R|kotlin/Any| {
     public abstract interface Sub : R|test/SameProjectionKind.Super| {
-        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|?
+        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number?>?|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|?
+        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number?>?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt

@@ -9,7 +9,7 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
     public abstract interface NonGeneric : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/String|?
+        public abstract fun foo(): R|kotlin/String?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt

@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesInvariantAndCovariantInferNullability :
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String?>|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt

@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesReturnJavaSubtype : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt

@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesReturnSameJavaType : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt

@@ -7,14 +7,14 @@ public abstract interface TwoSuperclassesSupplementNotNull : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String?>|
 
     }
 
     public abstract interface Super2 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|?
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>?|
 
     }