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

Improve framework name clash detection for top-level declarations

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2018-09-12 12:27:49 +03:00
committed by SvyatoslavScherbina
parent 29748e59df
commit 86e9908aff
1 changed files with 2 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/objcexport/ObjCExportNamer.kt
+2 -1
View File
@@ -407,7 +407,8 @@ private fun ObjCExportMapper.canBeInheritedBySameClass(
second: CallableMemberDescriptor
): Boolean {
if (this.isTopLevel(first) || this.isTopLevel(second)) {
return (first.containingDeclaration.fqNameSafe == second.containingDeclaration.fqNameSafe)
return this.isTopLevel(first) && this.isTopLevel(second) &&
first.source.containingFile == second.source.containingFile
}
val firstClass = this.getClassIfCategory(first) ?: first.containingDeclaration as ClassDescriptor