[FIR2IR] Minor: reuse approximateForIrOrNull utility in Fir2IrTypeC…

…onverter
JetBrains · Nov 10, 2023 · ef01b98 · Mpmhed · Dec 6, 2023 · ef01b98
1 parent 0283bab
commit ef01b98
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt
@@ -446,8 +446,4 @@ class Fir2IrImplicitCastInserter(
                 return lowerBound.isMarkedNullable != upperBound.isMarkedNullable
             }
     }
-
-    private fun ConeKotlinType.approximateForIrOrNull(): ConeKotlinType? {
-        return session.typeApproximator.approximateToSuperType(this, TypeApproximatorConfiguration.FrontendToBackendTypesApproximation)
-    }
 }
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
@@ -234,10 +234,7 @@ class Fir2IrTypeConverter(
                 original.toIrType(typeOrigin).makeNotNull()
             }
             is ConeIntersectionType -> {
-                val approximated = session.typeApproximator.approximateToSuperType(
-                    this,
-                    TypeApproximatorConfiguration.FrontendToBackendTypesApproximation
-                )!!
+                val approximated = approximateForIrOrNull()!!
                 approximated.toIrType(typeOrigin)
             }
             is ConeStubType -> createErrorType()
@@ -362,3 +359,8 @@ fun ConeKotlinType.toIrType(
     with(typeConverter) {
         toIrType(typeOrigin)
     }
+
+context(Fir2IrComponents)
+internal fun ConeKotlinType.approximateForIrOrNull(): ConeKotlinType? {
+    return session.typeApproximator.approximateToSuperType(this, TypeApproximatorConfiguration.FrontendToBackendTypesApproximation)
+}