From 3aa84906c21a10350ea26e685bdb93a8d631167f Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 12 Jan 2024 16:35:22 +0200
Subject: [PATCH] [Native] Use proper session for fir metadata serialization

^KT-64743 Fixed
---
 .../kotlin/fir/backend/generators/FakeOverrideGenerator.kt    | 3 +--
 .../org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
index b0e320498eb..e16ecf6cabb 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
@@ -248,8 +248,7 @@ class FakeOverrideGenerator(
                     if (!compatibleType) {
                         return@mapNotNull null
                     }
-                    // TODO: it should be already expanded - KT-64743
-                    symbol to superType.fullyExpandedType(session).lookupTag
+                    symbol to superType.lookupTag
                 }
             }
         }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt
index 69dd9025252..7d510123a8d 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt
@@ -83,7 +83,9 @@ internal fun PhaseContext.firSerializerBase(
             firFilesAndSessionsBySourceFile,
             bodiesOnlyForInlines = produceHeaderKlib,
             skipPrivateApi = produceHeaderKlib,
-    ) { firFile, session, scopeSession ->
+    ) { firFile, originalSession, originalScopeSession ->
+        val session = fir2IrInput?.components?.session ?: originalSession
+        val scopeSession = fir2IrInput?.components?.scopeSession ?: originalScopeSession
         serializeSingleFirFile(
                 firFile,
                 session,