[FIR] Expand typealias for correct approximation of types (particularly Int and Long)

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java

@@ -30669,6 +30669,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt");
             }
 
+            @Test
+            @TestMetadata("intToLongApproximationThroughTypeAlias.kt")
+            public void testIntToLongApproximationThroughTypeAlias() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/intToLongApproximationThroughTypeAlias.kt");
+            }
+
             @Test
             @TestMetadata("isAsWithTypeAlias.kt")
             public void testIsAsWithTypeAlias() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java

@@ -30669,6 +30669,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                 runTest("compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt");
             }
 
+            @Test
+            @TestMetadata("intToLongApproximationThroughTypeAlias.kt")
+            public void testIntToLongApproximationThroughTypeAlias() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/intToLongApproximationThroughTypeAlias.kt");
+            }
+
             @Test
             @TestMetadata("isAsWithTypeAlias.kt")
             public void testIsAsWithTypeAlias() throws Exception {

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

@@ -877,7 +877,8 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
                 val integerLiteralType =
                     ConeIntegerLiteralTypeImpl(constExpression.value as Long, isUnsigned = kind == ConstantValueKind.UnsignedIntegerLiteral)
                 if (data.expectedType != null) {
-                    val approximatedType = integerLiteralType.getApproximatedType(data.expectedType?.coneTypeSafe())
+                    val coneType = data.expectedType?.coneTypeSafe<ConeKotlinType>()?.fullyExpandedType(session)
+                    val approximatedType = integerLiteralType.getApproximatedType(coneType)
                     val newConstKind = approximatedType.toConstKind()
                     @Suppress("UNCHECKED_CAST")
                     constExpression.replaceKind(newConstKind as ConstantValueKind<T>)

compiler/testData/diagnostics/tests/typealias/intToLongApproximationThroughTypeAlias.kt

@@ -0,0 +1,6 @@
+// FIR_IDENTICAL
+typealias Hash = Long
+
+fun foo(): Hash {
+    return 0
+}

compiler/testData/diagnostics/tests/typealias/intToLongApproximationThroughTypeAlias.txt

@@ -0,0 +1,4 @@
+package
+
+public fun foo(): Hash /* = kotlin.Long */
+public typealias Hash = kotlin.Long

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -30765,6 +30765,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt");
             }
 
+            @Test
+            @TestMetadata("intToLongApproximationThroughTypeAlias.kt")
+            public void testIntToLongApproximationThroughTypeAlias() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/intToLongApproximationThroughTypeAlias.kt");
+            }
+
             @Test
             @TestMetadata("isAsWithTypeAlias.kt")
             public void testIsAsWithTypeAlias() throws Exception {

idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java

@@ -30669,6 +30669,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                 runTest("compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt");
             }
 
+            @Test
+            @TestMetadata("intToLongApproximationThroughTypeAlias.kt")
+            public void testIntToLongApproximationThroughTypeAlias() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/intToLongApproximationThroughTypeAlias.kt");
+            }
+
             @Test
             @TestMetadata("isAsWithTypeAlias.kt")
             public void testIsAsWithTypeAlias() throws Exception {