Remove dependency of ir.serialization.common on ir.backend.common

compiler/ir/serialization.common/build.gradle.kts

@@ -4,15 +4,12 @@ plugins {
 }
 
 dependencies {
-    // TODO: decouple from backend.common
     compile(project(":compiler:frontend"))
-    compile(project(":compiler:ir.backend.common"))
     compile(project(":compiler:ir.tree"))
     compile(project(":compiler:serialization"))
     compile(project(":kotlin-util-klib"))
     compile(project(":kotlin-util-klib-metadata"))
     compile(project(":compiler:util"))
-    compile(project(":compiler:ir.backend.common"))
     compileOnly(project(":kotlin-reflect-api"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.backend.common.serialization
 
-import org.jetbrains.kotlin.backend.common.lower.InnerClassesSupport
 import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilder
 import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideClassFilter
 import org.jetbrains.kotlin.backend.common.serialization.encodings.*
@@ -697,8 +696,7 @@ class IrDeclarationDeserializer(
         }
 
     companion object {
-        private val allKnownDeclarationOrigins =
-            IrDeclarationOrigin::class.nestedClasses.toList() + InnerClassesSupport.FIELD_FOR_OUTER_THIS::class
+        private val allKnownDeclarationOrigins = IrDeclarationOrigin::class.nestedClasses.toList()
         private val declarationOriginIndex =
             allKnownDeclarationOrigins.map { it.objectInstance as IrDeclarationOriginImpl }.associateBy { it.name }
     }

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.backend.common.serialization
 
-import org.jetbrains.kotlin.backend.common.ir.ir2string
 import org.jetbrains.kotlin.backend.common.serialization.encodings.*
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.IrElement
@@ -965,7 +964,7 @@ open class IrFileSerializer(
             is IrErrorCallExpression -> operationProto.errorCallExpression = serializeErrorCallExpression(expression)
             is IrErrorExpression -> operationProto.errorExpression = serializeErrorExpression(expression)
             else -> {
-                TODO("Expression serialization not implemented yet: ${ir2string(expression)}.")
+                TODO("Expression serialization not implemented yet: ${expression.render()}.")
             }
         }
         proto.setOperation(operationProto)
@@ -999,7 +998,7 @@ open class IrFileSerializer(
                 proto.syntheticBody = serializeSyntheticBody(statement)
             }
             else -> {
-                TODO("Statement not implemented yet: ${ir2string(statement)}")
+                TODO("Statement not implemented yet: ${statement.render()}")
             }
         }
         return proto.build()