IR fix IrType.makeNullable() for DNN type

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypes.kt

@@ -108,17 +108,28 @@ fun IrType.makeNotNull() =
             kotlinType = originalKotlinType?.makeNotNullable()
             hasQuestionMark = false
         }
-    } else
+    } else {
         this
+    }
 
-fun IrType.makeNullable() =
+fun IrType.makeNullable(): IrType =
-    if (this is IrSimpleType && !this.hasQuestionMark)
+    when (this) {
-        buildSimpleType {
+        is IrSimpleType -> {
-            kotlinType = originalKotlinType?.makeNullable()
+            if (this.hasQuestionMark)
-            hasQuestionMark = true
+                this
+            else
+                buildSimpleType {
+                    kotlinType = originalKotlinType?.makeNullable()
+                    hasQuestionMark = true
+                }
         }
-    else
+        is IrDefinitelyNotNullType -> {
-        this
+            // '{ T & Any }?' => 'T?'
+            this.original.makeNullable()
+        }
+        else ->
+            this
+    }
 
 @ObsoleteDescriptorBasedAPI
 fun IrType.toKotlinType(): KotlinType {