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

Don't skip empty packges of the current module when serializing.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-05-23 13:02:23 +03:00
committed by alexander-gorshenev
parent 57b1800354
commit ff86c16fc9
1 changed files with 7 additions and 7 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/KonanSerializationUtil.kt
+7 -7
View File
@@ -205,19 +205,19 @@ internal class KonanSerializationUtil(val context: Context) {
// TODO: ModuleDescriptor should be able to return // TODO: ModuleDescriptor should be able to return
// the package only with the contents of that module, without dependencies // the package only with the contents of that module, without dependencies
val skip: (DeclarationDescriptor) -> Boolean = val keep: (DeclarationDescriptor) -> Boolean =
{ DescriptorUtils.getContainingModule(it) != module } { DescriptorUtils.getContainingModule(it) == module }
val fragments = packageView.fragments
if (fragments.filter(keep).isEmpty()) return null
val classifierDescriptors = KonanDescriptorSerializer val classifierDescriptors = KonanDescriptorSerializer
.sort(packageView.memberScope.getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS)) .sort(packageView.memberScope.getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS))
.filterNot(skip) .filter(keep)
val fragments = packageView.fragments
val members = fragments val members = fragments
.flatMap { fragment -> DescriptorUtils.getAllDescriptors(fragment.getMemberScope()) } .flatMap { fragment -> DescriptorUtils.getAllDescriptors(fragment.getMemberScope()) }
.filterNot(skip) .filter(keep)
if (members.isEmpty() && classifierDescriptors.isEmpty()) return null
val classesBuilder = KonanLinkData.Classes.newBuilder() val classesBuilder = KonanLinkData.Classes.newBuilder()