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

Improve framework name clash detection for property setters

Browse Source 
Setters for equally named properties don't clash.

Fix #1843
This commit is contained in:
Svyatoslav Scherbina
2018-09-12 13:22:44 +03:00
committed by SvyatoslavScherbina
parent 86e9908aff
commit 40847df19f
1 changed files with 6 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/objcexport/ObjCExportNamer.kt
+6 -3
View File
@@ -444,12 +444,15 @@ private fun ObjCExportMapper.canHaveSameSelector(first: FunctionDescriptor, seco
if (first.extensionReceiverParameter?.type != second.extensionReceiverParameter?.type) { if (first.extensionReceiverParameter?.type != second.extensionReceiverParameter?.type) {
return false return false
} }
if (first.valueParameters.map { it.type } != second.valueParameters.map { it.type }) {
if (first is PropertySetterDescriptor && second is PropertySetterDescriptor) {
// Methods should merge in any common subclass as it can't have two properties with same name.
} else if (first.valueParameters.map { it.type } == second.valueParameters.map { it.type }) {
// Methods should merge in any common subclasses since they have the same signature.
} else {
return false return false
} }
// Otherwise both are Kotlin member methods should merge in any common subclass.
// Check if methods have the same bridge (and thus the same ABI): // Check if methods have the same bridge (and thus the same ABI):
return bridgeMethod(first) == bridgeMethod(second) return bridgeMethod(first) == bridgeMethod(second)
} }