Removed descriptors usage from IR copier

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt

@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.expressions.IrLoop
+import org.jetbrains.kotlin.ir.util.DeepCopyIrTreeWithSymbols
 import org.jetbrains.kotlin.ir.util.DeepCopySymbolRemapper
 import org.jetbrains.kotlin.ir.util.DeepCopyTypeRemapper
 import org.jetbrains.kotlin.ir.util.DescriptorsRemapper
@@ -45,7 +46,7 @@ fun <T : IrElement> T.deepCopyWithVariables(): T {
     val typesRemapper = DeepCopyTypeRemapper(symbolsRemapper)
 
     return this.transform(
-            object : DeepCopyIrTreeWithReturnableBlockSymbols(symbolsRemapper, typesRemapper) {
+            object : DeepCopyIrTreeWithSymbols(symbolsRemapper, typesRemapper) {
                 override fun getNonTransformedLoop(irLoop: IrLoop): IrLoop {
                     return irLoop
                 }

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/IrCopy.kt

@@ -1,68 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.backend.common
-
-import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.expressions.IrBlock
-import org.jetbrains.kotlin.ir.expressions.IrReturn
-import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock
-import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrReturnableBlockImpl
-import org.jetbrains.kotlin.ir.symbols.IrReturnableBlockSymbol
-import org.jetbrains.kotlin.ir.util.DeepCopyIrTreeWithSymbols
-import org.jetbrains.kotlin.ir.util.SymbolRemapper
-import org.jetbrains.kotlin.ir.util.TypeRemapper
-
-open class DeepCopyIrTreeWithReturnableBlockSymbols(
-    symbolRemapper: SymbolRemapper,
-    typeRemapper: TypeRemapper
-) : DeepCopyIrTreeWithSymbols(symbolRemapper, typeRemapper) {
-
-    private inline fun <reified T : IrElement> T.transform() =
-            transform(this@DeepCopyIrTreeWithReturnableBlockSymbols, null) as T
-
-    private val transformedReturnableBlocks = mutableMapOf<IrReturnableBlock, IrReturnableBlock>()
-
-    override fun visitBlock(expression: IrBlock): IrBlock = if (expression is IrReturnableBlock) {
-        IrReturnableBlockImpl(
-                expression.startOffset, expression.endOffset,
-                expression.type,
-                expression.descriptor,
-                expression.origin,
-                expression.sourceFileName
-        ).also {
-            transformedReturnableBlocks.put(expression, it)
-            it.statements.addAll(expression.statements.map { it.transform() })
-        }
-    } else {
-        super.visitBlock(expression)
-    }
-
-    override fun visitReturn(expression: IrReturn): IrReturn {
-        val returnTargetSymbol = expression.returnTargetSymbol
-        return if (returnTargetSymbol is IrReturnableBlockSymbol) {
-            IrReturnImpl(
-                    expression.startOffset, expression.endOffset,
-                    expression.type,
-                    transformedReturnableBlocks.getOrElse(returnTargetSymbol.owner) { returnTargetSymbol.owner }.symbol,
-                    expression.value.transform()
-            )
-        } else {
-            super.visitReturn(expression)
-        }
-    }
-}

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.resolve.scopes.TypeIntersectionScope
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver
+import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.types.*
@@ -130,6 +131,43 @@ open class WrappedValueParameterDescriptor(
     }
 }
 
+open class WrappedReceiverParameterDescriptor(
+    annotations: Annotations = Annotations.EMPTY,
+    sourceElement: SourceElement = SourceElement.NO_SOURCE
+) : ReceiverParameterDescriptor, WrappedCallableDescriptor<IrValueParameter>(annotations, sourceElement) {
+
+    override fun getValue(): ReceiverValue {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getContainingDeclaration(): DeclarationDescriptor =
+        (owner.parent as? IrFunction)?.descriptor ?: (owner.parent as IrClass).descriptor
+
+    override fun getType() = owner.type.toKotlinType()
+    override fun getName() = owner.name
+
+    override fun copy(newOwner: DeclarationDescriptor) = object : WrappedReceiverParameterDescriptor() {
+        override fun getContainingDeclaration() = newOwner
+    }.also { it.bind(owner) }
+
+    override fun getOverriddenDescriptors(): Collection<ValueParameterDescriptor> = emptyList()
+
+    override fun getOriginal() = this
+
+    override fun substitute(substitutor: TypeSubstitutor): ReceiverParameterDescriptor {
+        TODO("")
+    }
+
+    override fun getReturnType(): KotlinType? = owner.type.toKotlinType()
+
+    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D) =
+        visitor!!.visitReceiverParameterDescriptor(this, data)!!
+
+    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
+        visitor!!.visitReceiverParameterDescriptor(this, null)
+    }
+}
+
 open class WrappedTypeParameterDescriptor(
     annotations: Annotations = Annotations.EMPTY,
     sourceElement: SourceElement = SourceElement.NO_SOURCE
@@ -223,6 +261,7 @@ open class WrappedVariableDescriptor(
 
     override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
         visitor!!.visitVariableDescriptor(this, data)
+
     override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
         visitor!!.visitVariableDescriptor(this, null)
     }
@@ -255,6 +294,7 @@ open class WrappedSimpleFunctionDescriptor(
         .asSequence()
         .mapNotNull { it.descriptor as? ValueParameterDescriptor }
         .toMutableList()
+
     override fun isExternal() = owner.isExternal
     override fun isSuspend() = owner.isSuspend
     override fun isTailrec() = owner.isTailrec
@@ -321,6 +361,7 @@ open class WrappedClassConstructorDescriptor(
     override fun getDispatchReceiverParameter() = owner.dispatchReceiverParameter?.run {
         (containingDeclaration.containingDeclaration as ClassDescriptor).thisAsReceiverParameter
     }
+
     override fun getTypeParameters() = owner.typeParameters.map { it.descriptor }
     override fun getValueParameters() = owner.valueParameters.asSequence()
         .mapNotNull { it.descriptor as? ValueParameterDescriptor }
@@ -409,9 +450,9 @@ open class WrappedClassDescriptor(
 ) : ClassDescriptor, WrappedDeclarationDescriptor<IrClass>(annotations) {
     override fun getName() = owner.name
 
-    override fun getMemberScope(typeArguments: MutableList<out TypeProjection>)= MemberScope.Empty
+    override fun getMemberScope(typeArguments: MutableList<out TypeProjection>) = MemberScope.Empty
 
-    override fun getMemberScope(typeSubstitution: TypeSubstitution)= MemberScope.Empty
+    override fun getMemberScope(typeSubstitution: TypeSubstitution) = MemberScope.Empty
 
     override fun getUnsubstitutedMemberScope() = MemberScope.Empty