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

[interop] adoption of e8fba8bcb6

Browse Source
This commit is contained in:
Vasily Levchenko
2020-02-10 12:25:21 +01:00
parent 256d372d1c
commit 2e55d212a4
1 changed files with 3 additions and 3 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/ir/interop/DescriptorToIrTranslationUtils.kt
+3 -3
View File
@@ -82,7 +82,7 @@ internal interface DescriptorToIrTranslationMixin {
SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET,
IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, constructorDescriptor IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, constructorDescriptor
) )
constructorDescriptor.valueParameters.mapTo(irConstructor.valueParameters) { valueParameterDescriptor -> irConstructor.valueParameters += constructorDescriptor.valueParameters.map { valueParameterDescriptor ->
symbolTable.declareValueParameter( symbolTable.declareValueParameter(
SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED,
valueParameterDescriptor, valueParameterDescriptor,
@@ -123,7 +123,7 @@ internal interface DescriptorToIrTranslationMixin {
val irFunction = symbolTable.declareSimpleFunctionWithOverrides(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, origin, functionDescriptor) val irFunction = symbolTable.declareSimpleFunctionWithOverrides(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, origin, functionDescriptor)
symbolTable.withScope(functionDescriptor) { symbolTable.withScope(functionDescriptor) {
irFunction.returnType = functionDescriptor.returnType!!.toIrType() irFunction.returnType = functionDescriptor.returnType!!.toIrType()
functionDescriptor.valueParameters.mapTo(irFunction.valueParameters) { irFunction.valueParameters += functionDescriptor.valueParameters.map {
symbolTable.declareValueParameter(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED, it, it.type.toIrType()) symbolTable.declareValueParameter(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED, it, it.type.toIrType())
} }
irFunction.dispatchReceiverParameter = functionDescriptor.dispatchReceiverParameter?.let { irFunction.dispatchReceiverParameter = functionDescriptor.dispatchReceiverParameter?.let {
@@ -135,7 +135,7 @@ internal interface DescriptorToIrTranslationMixin {
} }
private fun IrDeclaration.generateAnnotations() { private fun IrDeclaration.generateAnnotations() {
descriptor.annotations.mapTo(annotations) { annotations += descriptor.annotations.map {
typeTranslator.constantValueGenerator.generateAnnotationConstructorCall(it)!! typeTranslator.constantValueGenerator.generateAnnotationConstructorCall(it)!!
} }
} }