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

Fix uniqId computation for property accessors

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-11-28 13:11:04 +07:00
committed by Sergey Bogolepov
parent d189ff416f
commit af5f07de17
1 changed files with 3 additions and 1 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/serialization/KonanIrModuleSerializer.kt
+3 -1
View File
@@ -1,6 +1,7 @@
package org.jetbrains.kotlin.backend.konan.serialization package org.jetbrains.kotlin.backend.konan.serialization
import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.descriptors.propertyIfAccessor
import org.jetbrains.kotlin.backend.common.serialization.* import org.jetbrains.kotlin.backend.common.serialization.*
import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary
import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.declarations.IrDeclaration
@@ -22,7 +23,8 @@ private class KonanDeclarationTable(
*/ */
override fun tryComputeBackendSpecificUniqId(declaration: IrDeclaration): UniqId? { override fun tryComputeBackendSpecificUniqId(declaration: IrDeclaration): UniqId? {
return if (declaration.descriptor.module.isFromInteropLibrary()) { return if (declaration.descriptor.module.isFromInteropLibrary()) {
UniqId(declaration.descriptor.getUniqId() ?: error("No uniq id found for ${declaration.descriptor}")) // Property accessor doesn't provide UniqId so we need to get it from the property itself.
UniqId(declaration.descriptor.propertyIfAccessor.getUniqId() ?: error("No uniq id found for ${declaration.descriptor}"))
} else { } else {
null null
} }