diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java index 5452dcb2c96..a152c52dfe6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java @@ -115,17 +115,7 @@ public class PackagePartCodegen extends MemberCodegen { JvmSerializationBindings bindings = v.getSerializationBindings(); DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JvmSerializerExtension(bindings, state.getTypeMapper())); - Collection packageFragments = Lists.newArrayList(); - //ContainerUtil.addIfNotNull(packageFragments, packageFragment); - //ContainerUtil.addIfNotNull(packageFragments, compiledPackageFragment); - - ProtoBuf.Package packageProto = serializer.packagePartProto(members, new Function1() { - @Override - public Boolean invoke(DeclarationDescriptor descriptor) { - //return !(descriptor instanceof CallableMemberDescriptor && relevantCallables.contains(descriptor)); - return false; - } - }).build(); + ProtoBuf.Package packageProto = serializer.packagePartProto(members).build(); if (packageProto.getMemberCount() == 0) return; diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 0be01dd3710..1d624627244 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -433,12 +433,10 @@ public class DescriptorSerializer { } @NotNull - public ProtoBuf.Package.Builder packagePartProto(@NotNull Collection members, @Nullable Function1 skip) { + public ProtoBuf.Package.Builder packagePartProto(@NotNull Collection members) { ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder(); for (DeclarationDescriptor declaration : sort(members)) { - if (skip != null && skip.invoke(declaration)) continue; - if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) { builder.addMember(callableProto((CallableMemberDescriptor) declaration)); }