From d9affc5abb212945c8418a9696c4c5a400cd70f9 Mon Sep 17 00:00:00 2001
From: Roman Artemev <roman.artemev@jetbrains.com>
Date: Mon, 12 Aug 2019 16:04:03 +0300
Subject: [PATCH] [IR SERIALIZATION] Raname IrIrSeriazlizedIrFile ->
 SerializedIrFile

---
 .../common/serialization/IrFileSerializer.kt  |  6 ++---
 .../serialization/IrModuleSerializer.kt       |  4 +--
 .../kotlin/library/KotlinLibraryWriter.kt     | 26 ++-----------------
 .../kotlin/library/impl/IrWriterImpl.kt       |  2 +-
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
index 36cd5472aad..498011bacb0 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.ir.util.lineStartOffsets
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
-import org.jetbrains.kotlin.library.IrIrSerializedIrFile
+import org.jetbrains.kotlin.library.SerializedIrFile
 import org.jetbrains.kotlin.library.impl.SerializedDeclaration
 import org.jetbrains.kotlin.library.impl.SkippedDeclaration
 import org.jetbrains.kotlin.library.impl.TopLevelDeclaration
@@ -1297,7 +1297,7 @@ open class IrFileSerializer(
     open fun backendSpecificExplicitRoot(declaration: IrFunction) = false
     open fun backendSpecificExplicitRoot(declaration: IrClass) = false
 
-    fun serializeIrFile(file: IrFile): IrIrSerializedIrFile {
+    fun serializeIrFile(file: IrFile): SerializedIrFile {
         val topLevelDeclarations = mutableListOf<SerializedDeclaration>()
 
         val proto = ProtoFile.newBuilder()
@@ -1350,7 +1350,7 @@ open class IrFileSerializer(
             }
         })
 
-        return IrIrSerializedIrFile(
+        return SerializedIrFile(
             proto.build().toByteArray(),
             file.fqName.pathSegments().map { it.identifier },
             file.path,
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt
index 66ff6c3bdd9..7b3dd624984 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt
@@ -8,13 +8,13 @@ package org.jetbrains.kotlin.backend.common.serialization
 import org.jetbrains.kotlin.backend.common.LoggingContext
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.library.IrIrSerializedIrFile
+import org.jetbrains.kotlin.library.SerializedIrFile
 import org.jetbrains.kotlin.library.SerializedIrModule
 
 abstract class IrModuleSerializer<F : IrFileSerializer>(protected val logger: LoggingContext) {
     abstract fun createSerializerForFile(file: IrFile): F
 
-    private fun serializeIrFile(file: IrFile): IrIrSerializedIrFile {
+    private fun serializeIrFile(file: IrFile): SerializedIrFile {
         val fileSerializer = createSerializerForFile(file)
         return fileSerializer.serializeIrFile(file)
     }
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryWriter.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryWriter.kt
index c24eb2e529a..8f734805a6b 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryWriter.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryWriter.kt
@@ -33,20 +33,7 @@ class SerializedMetadata(
     val fragmentNames: List<String>
 )
 
-class SerializedIrSymbol(
-    val symbolData: ByteArray,
-    val id: Long,
-    val isLocal: Boolean
-)
-
-//class SerializedIrFile(
-//    val fileData: ByteArray,
-//    val symbols: List<SerializedIrSymbol>,
-//    val types: List<ByteArray>,
-//    val strings: List<ByteArray>
-//)
-
-class IrIrSerializedIrFile(
+class SerializedIrFile(
     val fileData: ByteArray,
 //    val fileProto: ProtoFile,
     val fqName: List<String>,
@@ -59,13 +46,4 @@ class IrIrSerializedIrFile(
     val declarations: List<SerializedDeclaration>
 )
 
-class SerializedIrModule(val files: Collection<IrIrSerializedIrFile>)
-
-class SerializedIr(
-    val module: ByteArray,
-//    val symbols: List<Pair<Long, ByteArray>>,
-    val symbols: List<ByteArray>,
-    val types: List<ByteArray>,
-    val strings: List<ByteArray>,
-    val serializedDeclarations: List<SerializedDeclaration>
-)
\ No newline at end of file
+class SerializedIrModule(val files: Collection<SerializedIrFile>)
\ No newline at end of file
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/IrWriterImpl.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/IrWriterImpl.kt
index 22456589fb9..27344e21a46 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/IrWriterImpl.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/IrWriterImpl.kt
@@ -13,7 +13,7 @@ class IrWriterImpl(val irLayout: IrKotlinLibraryLayout) : IrWriter {
         irLayout.irTablesDir.mkdirs()
     }
 
-    private fun serializeFile(file: IrIrSerializedIrFile) {
+    private fun serializeFile(file: SerializedIrFile) {
         val fqnPath = file.fqName.joinToString(separator = "/")
         val fileId = file.path.hashCode().toString(Character.MAX_RADIX)