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

Package part proto generation fix

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-04 16:02:46 +03:00
parent 4958116566
commit 49ee4169f3
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
+1 -11
View File
@@ -115,17 +115,7 @@ public class PackagePartCodegen extends MemberCodegen<JetFile> {
JvmSerializationBindings bindings = v.getSerializationBindings();
DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JvmSerializerExtension(bindings, state.getTypeMapper()));
Collection<PackageFragmentDescriptor> packageFragments = Lists.newArrayList();
//ContainerUtil.addIfNotNull(packageFragments, packageFragment);
//ContainerUtil.addIfNotNull(packageFragments, compiledPackageFragment);
ProtoBuf.Package packageProto = serializer.packagePartProto(members, new Function1<DeclarationDescriptor, Boolean>() {
@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;
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+1 -3
View File
@@ -433,12 +433,10 @@ public class DescriptorSerializer {
}
@NotNull
public ProtoBuf.Package.Builder packagePartProto(@NotNull Collection<DeclarationDescriptor> members, @Nullable Function1<DeclarationDescriptor, Boolean> skip) {
public ProtoBuf.Package.Builder packagePartProto(@NotNull Collection<DeclarationDescriptor> 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));
}