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

Drop Callable and primary/secondary constructor proto messages

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-05 11:18:06 +03:00
parent e02854db6d
commit e4efa27b76
30 changed files with 261 additions and 8881 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+2 -2
View File
@@ -224,10 +224,10 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
DescriptorSerializer serializer =
DescriptorSerializer.createTopLevel(new JvmSerializerExtension(v.getSerializationBindings(), typeMapper));
ProtoBuf.Callable callableProto = serializer.callableProto(funDescriptor).build();
ProtoBuf.Function functionProto = serializer.functionProto(funDescriptor).build();
AnnotationVisitor av = v.getVisitor().visitAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_CALLABLE), true);
writeAnnotationData(av, serializer, callableProto);
writeAnnotationData(av, serializer, functionProto);
av.visitEnd();
}
compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
-2
View File
@@ -88,8 +88,6 @@ public class MultifileClassPartCodegen(
val serializer = DescriptorSerializer.createTopLevel(JvmSerializerExtension(bindings, state.typeMapper))
val packageProto = serializer.packagePartProto(members).build()
if (packageProto.memberCount == 0) return
val av = v.newAnnotation(AsmUtil.asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_MULTIFILE_CLASS_PART), true)
AsmUtil.writeAnnotationData(av, serializer, packageProto)
av.visit(JvmAnnotationNames.MULTIFILE_CLASS_NAME_FIELD_NAME, multifileClassType.internalName)
compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
-2
View File
@@ -123,8 +123,6 @@ public class PackagePartCodegen extends MemberCodegen<JetFile> {
DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JvmSerializerExtension(bindings, state.getTypeMapper()));
ProtoBuf.Package packageProto = serializer.packagePartProto(members).build();
if (packageProto.getMemberCount() == 0) return;
AnnotationVisitor av = v.newAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_FILE_FACADE), true);
writeAnnotationData(av, serializer, packageProto);
av.visitEnd();
compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
+1 -8
View File
@@ -64,10 +64,6 @@ public class JvmSerializerExtension extends SerializerExtension {
}
}
@Override
public void serializeCallable(@NotNull CallableMemberDescriptor callable, @NotNull ProtoBuf.Callable.Builder proto) {
}
@Override
public void serializeValueParameter(@NotNull ValueParameterDescriptor descriptor, @NotNull ProtoBuf.ValueParameter.Builder proto) {
Integer index = bindings.get(INDEX_FOR_VALUE_PARAMETER, descriptor);
@@ -175,10 +171,7 @@ public class JvmSerializerExtension extends SerializerExtension {
if (name == null) return;
int index = stringTable.getStringIndex(name);
if (proto instanceof ProtoBuf.Callable.Builder) {
((ProtoBuf.Callable.Builder) proto).setExtension(JvmProtoBuf.oldImplClassName, index);
}
else if (proto instanceof ProtoBuf.Function.Builder) {
if (proto instanceof ProtoBuf.Function.Builder) {
((ProtoBuf.Function.Builder) proto).setExtension(JvmProtoBuf.methodImplClassName, index);
}
else if (proto instanceof ProtoBuf.Property.Builder) {