azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR] Used common type parameters copy function

Browse Source 
This fixes possible [IR_VALIDATION] warnings because
previously noone set parents for copied type parameters
This commit is contained in:
Igor Chevdar
2020-03-02 16:53:03 +03:00
parent b339c950b5
commit 5e30eaef55
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
+8 -19
View File
@@ -44,6 +44,7 @@ import java.lang.System.out
import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.LazyThreadSafetyMode.PUBLICATION
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
import org.jetbrains.kotlin.backend.common.ir.copyTo import org.jetbrains.kotlin.backend.common.ir.copyTo
import org.jetbrains.kotlin.backend.common.ir.copyToWithoutSuperTypes
import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExport import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExport
import org.jetbrains.kotlin.backend.konan.llvm.coverage.CoverageManager import org.jetbrains.kotlin.backend.konan.llvm.coverage.CoverageManager
import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
@@ -145,7 +146,8 @@ internal class SpecialDeclarationsFactory(val context: Context) {
isFakeOverride = false, isFakeOverride = false,
isOperator = false isOperator = false
).apply { ).apply {
descriptor.bind(this) val bridge = this
descriptor.bind(bridge)
parent = function.parent parent = function.parent
val dispatchReceiver = when (bridgeDirections.array[1]) { val dispatchReceiver = when (bridgeDirections.array[1]) {
@@ -168,25 +170,12 @@ internal class SpecialDeclarationsFactory(val context: Context) {
} }
} }
dispatchReceiverParameter = dispatchReceiver?.copyTo(this) dispatchReceiverParameter = dispatchReceiver?.copyTo(bridge)
extensionReceiverParameter = extensionReceiver?.copyTo(this) extensionReceiverParameter = extensionReceiver?.copyTo(bridge)
valueParameters += function.valueParameters.map { it.copyTo(this, type = valueParameterTypes[it.index]) } valueParameters += function.valueParameters.map { it.copyTo(bridge, type = valueParameterTypes[it.index]) }
typeParameters += function.typeParameters.mapIndexed { index, parameter -> typeParameters += function.typeParameters.map { parameter ->
WrappedTypeParameterDescriptor().let { parameter.copyToWithoutSuperTypes(bridge).also { it.superTypes += parameter.superTypes }
IrTypeParameterImpl(
startOffset, endOffset,
origin,
IrTypeParameterSymbolImpl(it),
parameter.name,
index,
parameter.isReified,
parameter.variance
).apply {
it.bind(this)
superTypes += parameter.superTypes
}
}
} }
} }
} }