[FIR] Fix non-serializable type argument at the end of resolve

compiler/fir/analysis-tests/testData/resolveWithStdlib/withInInitializer.txt

@@ -13,8 +13,8 @@ FILE: withInInitializer.kt
             super<R|kotlin/Any|>()
         }
 
-        public final val list: R|kotlin/collections/List<it(kotlin/Comparable<*> & java/io/Serializable)>| = R|kotlin/collections/listOf|<R|it(kotlin/Comparable<*> & java/io/Serializable)|>(vararg(Int(1), Int(2), Int(3), String()))
+        public final val list: R|kotlin/collections/List<kotlin/Any>| = R|kotlin/collections/listOf|<R|it(kotlin/Comparable<*> & java/io/Serializable)|>(vararg(Int(1), Int(2), Int(3), String()))
-            public get(): R|kotlin/collections/List<it(kotlin/Comparable<*> & java/io/Serializable)>|
+            public get(): R|kotlin/collections/List<kotlin/Any>|
 
         public final val data: R|First| = R|/First.First|(Int(42))
             public get(): R|First|

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt

@@ -968,6 +968,19 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
         }
     }
 
+    private fun ConeKotlinType.requiresApproximationInPublicPosition(): Boolean {
+        return when (this) {
+            is ConeIntegerLiteralType,
+            is ConeCapturedType,
+            is ConeDefinitelyNotNullType,
+            is ConeIntersectionType -> true
+            is ConeClassLikeType -> typeArguments.any {
+                it is ConeKotlinTypeProjection && it.type.requiresApproximationInPublicPosition()
+            }
+            else -> false
+        }
+    }
+
     private fun FirTypeRef.approximateTypeIfNeeded(
         containingCallableVisibility: Visibility?,
         isInlineFunction: Boolean = false
@@ -975,20 +988,14 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
         val approximatedType = if (this is FirResolvedTypeRef &&
             (containingCallableVisibility == Public || containingCallableVisibility == Protected)
         ) {
-            when (this.type) {
+            if (type.requiresApproximationInPublicPosition()) {
-                is ConeIntegerLiteralType,
+                this.withReplacedConeType(
-                is ConeCapturedType,
+                    inferenceComponents.approximator.approximateToSuperType(
-                is ConeDefinitelyNotNullType,
+                        this.type, TypeApproximatorConfiguration.PublicDeclaration
-                is ConeIntersectionType -> {
+                    ) as? ConeKotlinType
-                    this.withReplacedConeType(
+                )
-                        inferenceComponents.approximator.approximateToSuperType(
+            } else {
-                            this.type, TypeApproximatorConfiguration.PublicDeclaration
+                this
-                        ) as ConeKotlinType
-                    )
-                }
-                else -> {
-                    this
-                }
             }
         } else {
             this

compiler/testData/codegen/box/regressions/commonSupertypeContravariant2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface In<in E>
 class A : In<A>
 class B : In<B>

compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInvariantPosition.fir.kt

@@ -20,5 +20,5 @@ fun <S> test(i: Int, s: S) {
 
     c
 
-    takeInvInt(create(i))
+    <!INAPPLICABLE_CANDIDATE!>takeInvInt<!>(create(i))
 }