From 7fff5407be80f5da8a80e5e9eb3df2d6fad468f5 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 6 Sep 2019 12:53:57 +0700
Subject: [PATCH] [Commonizer] Internal improvements

---
 .../commonizer/builder/DeclarationsBuilderVisitor.kt      | 2 +-
 .../descriptors/commonizer/builder/functionDescriptors.kt | 8 ++++----
 .../descriptors/commonizer/builder/moduleDescriptors.kt   | 6 +++---
 .../descriptors/commonizer/builder/packageFragments.kt    | 6 +++---
 .../descriptors/commonizer/builder/propertyDescriptors.kt | 6 +++---
 .../commonizer/core/CallableMemberCommonizer.kt           | 2 +-
 .../descriptors/commonizer/core/FunctionCommonizer.kt     | 6 +++---
 .../commonizer/core/FunctionModifiersCommonizer.kt        | 2 +-
 .../descriptors/commonizer/core/PropertyCommonizer.kt     | 6 +++---
 .../commonizer/core/PropertySetterCommonizer.kt           | 2 +-
 .../commonizer/core/ValueParameterCommonizer.kt           | 4 ++--
 .../kotlin/descriptors/commonizer/mergedtree/functions.kt | 2 +-
 .../commonizer/{ => mergedtree}/ir/CallableMember.kt      | 4 ++--
 .../commonizer/{ => mergedtree}/ir/Function.kt            | 2 +-
 .../descriptors/commonizer/{ => mergedtree}/ir/Module.kt  | 2 +-
 .../commonizer/{ => mergedtree}/ir/NodeVisitor.kt         | 2 +-
 .../descriptors/commonizer/{ => mergedtree}/ir/Package.kt | 2 +-
 .../commonizer/{ => mergedtree}/ir/Property.kt            | 6 +++---
 .../descriptors/commonizer/{ => mergedtree}/ir/Root.kt    | 2 +-
 .../commonizer/{ => mergedtree}/ir/nodeBuilders.kt        | 2 +-
 .../descriptors/commonizer/{ => mergedtree}/ir/nodes.kt   | 2 +-
 .../kotlin/descriptors/commonizer/mergedtree/modules.kt   | 4 ++--
 .../kotlin/descriptors/commonizer/mergedtree/packages.kt  | 4 ++--
 .../descriptors/commonizer/mergedtree/properties.kt       | 2 +-
 .../kotlin/descriptors/commonizer/mergedtree/root.kt      | 4 ++--
 ...sicCommonizerFacadeTest.kt => CommonizerFacadeTest.kt} | 2 +-
 .../jetbrains/kotlin/descriptors/commonizer/assertions.kt | 5 ++---
 .../core/DefaultFunctionModifiersCommonizerTest.kt        | 2 +-
 .../core/DefaultPropertySetterCommonizerTest.kt           | 2 +-
 .../core/DefaultValueParameterCommonizerTest.kt           | 4 ++--
 .../core/DefaultValueParameterListCommonizerTest.kt       | 2 +-
 .../org/jetbrains/kotlin/descriptors/commonizer/mocks.kt  | 2 +-
 32 files changed, 54 insertions(+), 55 deletions(-)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/CallableMember.kt (92%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/Function.kt (97%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/Module.kt (82%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/NodeVisitor.kt (88%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/Package.kt (82%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/Property.kt (94%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/Root.kt (83%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/nodeBuilders.kt (97%)
 rename konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/{ => mergedtree}/ir/nodes.kt (96%)
 rename konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/{BasicCommonizerFacadeTest.kt => CommonizerFacadeTest.kt} (98%)

diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor.kt
index ae7f4e429ac..7e55a5177ce 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroup
 import org.jetbrains.kotlin.descriptors.commonizer.TargetId
 import org.jetbrains.kotlin.descriptors.commonizer.builder.CommonizedMemberScope.Companion.plusAssign
 import org.jetbrains.kotlin.descriptors.commonizer.builder.CommonizedPackageFragmentProvider.Companion.plusAssign
-import org.jetbrains.kotlin.descriptors.commonizer.ir.*
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.*
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.utils.addIfNotNull
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt
index 4decd9924dd..0fcf3856835 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt
@@ -10,10 +10,10 @@ import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroup
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Function
-import org.jetbrains.kotlin.descriptors.commonizer.ir.FunctionNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ValueParameter
-import org.jetbrains.kotlin.descriptors.commonizer.ir.indexOfCommon
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Function
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.FunctionNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ValueParameter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.indexOfCommon
 import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
 import org.jetbrains.kotlin.resolve.DescriptorFactory
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt
index b531570e85e..9eb4609ed66 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt
@@ -7,9 +7,9 @@ package org.jetbrains.kotlin.descriptors.commonizer.builder
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroup
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Module
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ModuleNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.indexOfCommon
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Module
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ModuleNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.indexOfCommon
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.storage.StorageManager
 
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt
index 20f5e5e4407..d909dbf3598 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt
@@ -7,9 +7,9 @@ package org.jetbrains.kotlin.descriptors.commonizer.builder
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroup
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Package
-import org.jetbrains.kotlin.descriptors.commonizer.ir.PackageNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.indexOfCommon
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Package
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.PackageNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.indexOfCommon
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.kotlin.name.FqName
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt
index 3aa575692d6..abb09930559 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroup
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Property
-import org.jetbrains.kotlin.descriptors.commonizer.ir.PropertyNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.indexOfCommon
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Property
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.PropertyNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.indexOfCommon
 import org.jetbrains.kotlin.descriptors.impl.FieldDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
 import org.jetbrains.kotlin.resolve.DescriptorFactory
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableMemberCommonizer.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableMemberCommonizer.kt
index b0a2651f160..939c4bce6ec 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableMemberCommonizer.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableMemberCommonizer.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.CallableMember
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.CallableMember
 import org.jetbrains.kotlin.name.Name
 
 abstract class CallableMemberCommonizer<T : CallableMemberDescriptor, R: CallableMember> : Commonizer<T, R> {
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt
index c5a9f71f183..cd540a94731 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt
@@ -6,9 +6,9 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.CommonFunction
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ExtensionReceiver.Companion.toReceiverNoAnnotations
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Function
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.CommonFunction
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ExtensionReceiver.Companion.toReceiverNoAnnotations
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Function
 
 class FunctionCommonizer : CallableMemberCommonizer<SimpleFunctionDescriptor, Function>() {
     private val modifiers = FunctionModifiersCommonizer.default()
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt
index 7bcbe80d78f..86be8044aab 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.FunctionModifiers
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.FunctionModifiers
 
 interface FunctionModifiersCommonizer : Commonizer<SimpleFunctionDescriptor, FunctionModifiers> {
     companion object {
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
index 159843f82c7..ec5d820ef96 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
@@ -6,9 +6,9 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.CommonProperty
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ExtensionReceiver.Companion.toReceiverNoAnnotations
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Property
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.CommonProperty
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ExtensionReceiver.Companion.toReceiverNoAnnotations
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Property
 
 class PropertyCommonizer : CallableMemberCommonizer<PropertyDescriptor, Property>() {
     private val setter = PropertySetterCommonizer.default()
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt
index e8766967693..9a6512c3561 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor
 import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Setter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Setter
 
 interface PropertySetterCommonizer : Commonizer<PropertySetterDescriptor?, Setter?> {
     companion object {
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt
index dfa834275d0..f63cc75af8b 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.CommonValueParameter
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ValueParameter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.CommonValueParameter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ValueParameter
 import org.jetbrains.kotlin.descriptors.commonizer.isNull
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.UnwrappedType
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/functions.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/functions.kt
index 76455b36779..27b4070bc7b 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/functions.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/functions.kt
@@ -6,6 +6,6 @@
 package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
 
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.buildFunctionNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.buildFunctionNode
 
 internal fun mergeFunctions(properties: List<SimpleFunctionDescriptor?>) = buildFunctionNode(properties)
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/CallableMember.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CallableMember.kt
similarity index 92%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/CallableMember.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CallableMember.kt
index 9a69ac92f52..c237becb521 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/CallableMember.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CallableMember.kt
@@ -3,14 +3,14 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ExtensionReceiver.Companion.toReceiver
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ExtensionReceiver.Companion.toReceiver
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.UnwrappedType
 
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Function.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Function.kt
similarity index 97%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Function.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Function.kt
index 8c7b70e6e87..fe184f5a0db 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Function.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Function.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Module.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Module.kt
similarity index 82%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Module.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Module.kt
index d9b1d8174f8..b29aad1be72 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Module.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Module.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.name.Name
 
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/NodeVisitor.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/NodeVisitor.kt
similarity index 88%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/NodeVisitor.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/NodeVisitor.kt
index 4b715df8933..9c0b415f492 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/NodeVisitor.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/NodeVisitor.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 interface NodeVisitor<R, T> {
     fun visitRootNode(node: RootNode, data: T): R
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Package.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Package.kt
similarity index 82%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Package.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Package.kt
index 5c5b0abfa6a..0cf1522f8f4 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Package.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Package.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.name.FqName
 
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Property.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Property.kt
similarity index 94%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Property.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Property.kt
index 8fd66fee33f..ac35725258d 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Property.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Property.kt
@@ -3,14 +3,14 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.UnwrappedType
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Getter.Companion.toGetter
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Setter.Companion.toSetter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Getter.Companion.toGetter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Setter.Companion.toSetter
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
 
 interface Property : CallableMember, Declaration {
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Root.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Root.kt
similarity index 83%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Root.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Root.kt
index 5639fbf22aa..47e5a3a276b 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/Root.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/Root.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.descriptors.commonizer.TargetId
 
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/nodeBuilders.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt
similarity index 97%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/nodeBuilders.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt
index 192b49aae1e..d3199f5ec30 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/nodeBuilders.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/nodes.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt
similarity index 96%
rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/nodes.kt
rename to konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt
index ff179f12291..d74efeaa82c 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ir/nodes.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.descriptors.commonizer.ir
+package org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir
 
 interface Declaration
 
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt
index 2c2e25ce156..033fa36b57d 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt
@@ -7,8 +7,8 @@ package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroupMap
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ModuleNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.buildModuleNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ModuleNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.buildModuleNode
 import org.jetbrains.kotlin.descriptors.commonizer.toList
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.name.FqName
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt
index a08283aaf7f..90486ade731 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt
@@ -13,8 +13,8 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.descriptors.commonizer.ir.PackageNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.buildPackageNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.PackageNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.buildPackageNode
 
 internal fun mergePackages(
     packageFqName: FqName,
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/properties.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/properties.kt
index 75daf4f81ed..8fb1c50b6e8 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/properties.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/properties.kt
@@ -6,6 +6,6 @@
 package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
 
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.buildPropertyNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.buildPropertyNode
 
 internal fun mergeProperties(properties: List<PropertyDescriptor?>) = buildPropertyNode(properties)
diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt
index 7d452714701..e33295feee8 100644
--- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt
+++ b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.CommonizedGroupMap
 import org.jetbrains.kotlin.descriptors.commonizer.ConcreteTargetId
-import org.jetbrains.kotlin.descriptors.commonizer.ir.RootNode
-import org.jetbrains.kotlin.descriptors.commonizer.ir.buildRootNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.RootNode
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.buildRootNode
 import org.jetbrains.kotlin.name.Name
 
 internal fun mergeRoots(modulesByTargets: List<Pair<ConcreteTargetId, Collection<ModuleDescriptor>>>): RootNode {
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/BasicCommonizerFacadeTest.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt
similarity index 98%
rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/BasicCommonizerFacadeTest.kt
rename to konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt
index c90b23616b4..811fa8740da 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/BasicCommonizerFacadeTest.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.AbstractCommonizationFromSour
 import kotlin.contracts.ExperimentalContracts
 
 @ExperimentalContracts
-class BasicCommonizerFacadeTest {
+class CommonizerFacadeTest {
 
     @Test
     fun nothingToCommonize0() {
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/assertions.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/assertions.kt
index 1d3adf7bac0..dc33134bc1d 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/assertions.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/assertions.kt
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.*
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.KotlinType
 import java.io.File
@@ -294,8 +293,8 @@ private class ComparingDeclarationsVisitor(
 
         if (expectedUnwrapped === actualUnwrapped) return
 
-        val expectedFqName = expectedUnwrapped.constructor.declarationDescriptor!!.fqNameSafe
-        val actualFqName = actualUnwrapped.constructor.declarationDescriptor!!.fqNameSafe
+        val expectedFqName = expectedUnwrapped.fqName
+        val actualFqName = actualUnwrapped.fqName
 
         context.assertEquals(expectedFqName, actualFqName, "type FQN")
     }
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt
index 68b969faffa..2be46e07938 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.TestFunctionModifiers
 import org.jetbrains.kotlin.descriptors.commonizer.TestFunctionModifiers.Companion.areEqual
-import org.jetbrains.kotlin.descriptors.commonizer.ir.FunctionModifiers
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.FunctionModifiers
 import org.jetbrains.kotlin.descriptors.commonizer.mockClassType
 import org.jetbrains.kotlin.descriptors.commonizer.mockFunction
 import org.jetbrains.kotlin.types.refinement.TypeRefinement
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt
index 3fe699ee9e6..56ea083a033 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities.*
 import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.descriptors.commonizer.ir.Setter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.Setter
 import org.jetbrains.kotlin.descriptors.commonizer.mockClassType
 import org.jetbrains.kotlin.descriptors.commonizer.mockProperty
 import org.jetbrains.kotlin.types.refinement.TypeRefinement
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt
index 0091eac7272..9b9ef827af4 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.CommonValueParameter
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ValueParameter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.CommonValueParameter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ValueParameter
 import org.jetbrains.kotlin.descriptors.commonizer.mockClassType
 import org.jetbrains.kotlin.descriptors.commonizer.mockValueParameter
 import org.jetbrains.kotlin.name.Name
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt
index 33c1f4c387d..dd8f3395755 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
-import org.jetbrains.kotlin.descriptors.commonizer.ir.ValueParameter
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.ValueParameter
 import org.jetbrains.kotlin.types.refinement.TypeRefinement
 import org.junit.Test
 
diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/mocks.kt b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/mocks.kt
index ec626d7b777..5a312db119a 100644
--- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/mocks.kt
+++ b/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/mocks.kt
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.descriptors.commonizer
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.descriptors.commonizer.ir.FunctionModifiers
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ir.FunctionModifiers
 import org.jetbrains.kotlin.descriptors.impl.*
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name