[NI] Discriminate resulting type Nothing(?) at fixation stage

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt

@@ -27,7 +27,8 @@ import org.jetbrains.kotlin.types.checker.intersectTypes
 import org.jetbrains.kotlin.types.typeUtil.isPrimitiveNumberType
 
 class ResultTypeResolver(
-    val typeApproximator: TypeApproximator
+    val typeApproximator: TypeApproximator,
+    val trivialConstraintTypeInferenceOracle: TrivialConstraintTypeInferenceOracle
 ) {
     interface Context {
         fun isProperType(type: UnwrappedType): Boolean
@@ -77,6 +78,9 @@ class ResultTypeResolver(
             if (!isProperType(constraint.type)) continue
             if (!checkConstraint(constraint.type, constraint.kind, resultType)) return false
         }
+
+        if (!trivialConstraintTypeInferenceOracle.isSuitableResultedType(resultType)) return false
+
         return true
     }
 

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/TrivialConstraintTypeInferenceOracle.kt

@@ -19,6 +19,13 @@ class TrivialConstraintTypeInferenceOracle {
         // TODO: probably we also can take into account `T <: Any(?)` constraints
         return constraint.kind == ConstraintKind.LOWER && constraint.type.isNothingOrNullableNothing()
     }
+
+    // This function controls the choice between sub and super result type
+    // Even that Nothing(?) is the most specific type for subtype, it doesn't bring valuable information to the user,
+    // therefore it is discriminated in favor of supertype
+    fun isSuitableResultedType(resultType: UnwrappedType): Boolean {
+        return !resultType.isNothingOrNullableNothing()
+    }
 }
 
 private fun UnwrappedType.isNothingOrNullableNothing(): Boolean =