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

Deserialize annotations from package$src files if needed

Browse Source 
For top-level members, we now write a FQ name of the package$src class which
has the member's annotations, and read the correct file in deserialization
This commit is contained in:
Alexander Udalov
2013-07-15 19:38:49 +04:00
parent e63a087ee5
commit cfe9d78015
16 changed files with 181 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+10 -1
View File
@@ -46,6 +46,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.*;
@@ -112,7 +113,15 @@ public class FunctionCodegen extends GenerationStateAware {
asmMethod.getDescriptor(),
jvmSignature.getGenericsSignature(),
null);
v.getMemberMap().recordMethodOfDescriptor(functionDescriptor, asmMethod);
OwnerKind contextKind = owner.getContextKind();
if (contextKind instanceof OwnerKind.StaticDelegateKind) {
FqName fqName = ((OwnerKind.StaticDelegateKind) contextKind).getOwnerClass().getFqName();
v.getMemberMap().recordSrcClassNameForCallable(functionDescriptor, fqName.shortName());
}
else {
v.getMemberMap().recordMethodOfDescriptor(functionDescriptor, asmMethod);
}
AnnotationCodegen.forMethod(mv, typeMapper).genAnnotations(functionDescriptor);
if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES) return;
compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java
+22 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jet.descriptors.serialization.NameTable;
import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
import org.jetbrains.jet.descriptors.serialization.SerializerExtension;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
public class JavaSerializerExtension extends SerializerExtension {
private final MemberMap memberMap;
@@ -38,9 +39,18 @@ public class JavaSerializerExtension extends SerializerExtension {
@NotNull CallableMemberDescriptor callable,
@NotNull ProtoBuf.Callable.Builder proto,
@NotNull NameTable nameTable
) {
saveSignature(callable, proto, nameTable);
saveSrcClassName(callable, proto, nameTable);
}
private void saveSignature(
@NotNull CallableMemberDescriptor callable,
@NotNull ProtoBuf.Callable.Builder proto,
@NotNull NameTable nameTable
) {
if (callable instanceof FunctionDescriptor) {
Method method = memberMap.getMethodOfDescriptor(callable);
Method method = memberMap.getMethodOfDescriptor((FunctionDescriptor) callable);
if (method != null) {
JavaProtoBufUtil.saveMethodSignature(proto, method, nameTable);
}
@@ -71,4 +81,15 @@ public class JavaSerializerExtension extends SerializerExtension {
JavaProtoBufUtil.savePropertySignature(proto, fieldType, fieldName, syntheticMethodName, getterMethod, setterMethod, nameTable);
}
}
private void saveSrcClassName(
@NotNull CallableMemberDescriptor callable,
@NotNull ProtoBuf.Callable.Builder proto,
@NotNull NameTable nameTable
) {
Name name = memberMap.getSrcClassNameOfCallable(callable);
if (name != null) {
JavaProtoBufUtil.saveSrcClassName(proto, name, nameTable);
}
}
}
compiler/backend/src/org/jetbrains/jet/codegen/MemberMap.java
+23 -5
View File
@@ -22,22 +22,25 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.Method;
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
public final class MemberMap {
private final Map<CallableMemberDescriptor, Method> methodForFunction = new HashMap<CallableMemberDescriptor, Method>();
private final Map<FunctionDescriptor, Method> methodForFunction = new HashMap<FunctionDescriptor, Method>();
private final Map<PropertyDescriptor, Pair<Type, String>> fieldForProperty = new HashMap<PropertyDescriptor, Pair<Type, String>>();
private final Map<PropertyDescriptor, String> syntheticMethodNameForProperty = new HashMap<PropertyDescriptor, String>();
private final Map<CallableMemberDescriptor, Name> srcClassNameForCallable = new HashMap<CallableMemberDescriptor, Name>();
@NotNull
public static MemberMap union(@NotNull Collection<MemberMap> maps) {
MemberMap result = new MemberMap();
for (MemberMap map : maps) {
for (Map.Entry<CallableMemberDescriptor, Method> entry : map.methodForFunction.entrySet()) {
for (Map.Entry<FunctionDescriptor, Method> entry : map.methodForFunction.entrySet()) {
result.recordMethodOfDescriptor(entry.getKey(), entry.getValue());
}
@@ -48,12 +51,16 @@ public final class MemberMap {
for (Map.Entry<PropertyDescriptor, String> entry : map.syntheticMethodNameForProperty.entrySet()) {
result.recordSyntheticMethodNameOfProperty(entry.getKey(), entry.getValue());
}
for (Map.Entry<CallableMemberDescriptor, Name> entry : map.srcClassNameForCallable.entrySet()) {
result.recordSrcClassNameForCallable(entry.getKey(), entry.getValue());
}
}
return result;
}
public void recordMethodOfDescriptor(@NotNull CallableMemberDescriptor descriptor, @NotNull Method method) {
public void recordMethodOfDescriptor(@NotNull FunctionDescriptor descriptor, @NotNull Method method) {
Method old = methodForFunction.put(descriptor, method);
assert old == null : "Duplicate method for callable member: " + descriptor + "; " + old;
}
@@ -68,8 +75,13 @@ public final class MemberMap {
assert old == null : "Duplicate synthetic method for property: " + descriptor + "; " + old;
}
public void recordSrcClassNameForCallable(@NotNull CallableMemberDescriptor descriptor, @NotNull Name name) {
Name old = srcClassNameForCallable.put(descriptor, name);
assert old == null : "Duplicate src class name for callable: " + descriptor + "; " + old;
}
@Nullable
public Method getMethodOfDescriptor(@NotNull CallableMemberDescriptor descriptor) {
public Method getMethodOfDescriptor(@NotNull FunctionDescriptor descriptor) {
return methodForFunction.get(descriptor);
}
@@ -83,10 +95,16 @@ public final class MemberMap {
return syntheticMethodNameForProperty.get(descriptor);
}
@Nullable
public Name getSrcClassNameOfCallable(@NotNull CallableMemberDescriptor descriptor) {
return srcClassNameForCallable.get(descriptor);
}
@Override
public String toString() {
return "Functions: " + methodForFunction.size() +
", fields: " + fieldForProperty.size() +
", synthetic methods: " + syntheticMethodNameForProperty.size();
", synthetic methods: " + syntheticMethodNameForProperty.size() +
", src class names: " + srcClassNameForCallable.size();
}
}
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+7 -4
View File
@@ -99,14 +99,17 @@ public class NamespaceCodegen extends MemberCodegen {
}
public void generate(@NotNull CompilationErrorHandler errorHandler) {
List<MemberMap> namespaceMembers = new ArrayList<MemberMap>(files.size() + 1);
if (shouldGenerateNSClass(files)) {
AnnotationVisitor packageClassAnnotation =
v.getClassBuilder().newAnnotation(JvmStdlibNames.JET_PACKAGE_CLASS.getDescriptor(), true);
ClassBuilder cv = v.getClassBuilder();
AnnotationVisitor packageClassAnnotation = cv.newAnnotation(JvmStdlibNames.JET_PACKAGE_CLASS.getDescriptor(), true);
packageClassAnnotation.visit(JvmStdlibNames.ABI_VERSION_NAME, JvmAbi.VERSION);
packageClassAnnotation.visitEnd();
}
List<MemberMap> namespaceMembers = new ArrayList<MemberMap>();
namespaceMembers.add(cv.getMemberMap());
}
for (JetFile file : files) {
try {
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+7 -1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
@@ -88,9 +89,14 @@ public class PropertyCodegen extends GenerationStateAware {
assert kind instanceof OwnerKind.StaticDelegateKind || kind == OwnerKind.NAMESPACE || kind == OwnerKind.IMPLEMENTATION || kind == OwnerKind.TRAIT_IMPL
: "Generating property with a wrong kind (" + kind + "): " + propertyDescriptor;
if (kind != OwnerKind.TRAIT_IMPL && !(kind instanceof OwnerKind.StaticDelegateKind)) {
if (kind instanceof OwnerKind.StaticDelegateKind) {
FqName fqName = ((OwnerKind.StaticDelegateKind) kind).getOwnerClass().getFqName();
v.getMemberMap().recordSrcClassNameForCallable(propertyDescriptor, fqName.shortName());
}
else if (kind != OwnerKind.TRAIT_IMPL) {
generateBackingField(p, propertyDescriptor);
}
generateGetter(p, propertyDescriptor, p.getGetter());
generateSetter(p, propertyDescriptor, p.getSetter());
compiler/frontend.java/serialization.java/src/java_descriptors.proto
+3
View File
@@ -69,4 +69,7 @@ extend Callable {
optional JavaMethodSignature method_signature = 100;
optional JavaPropertySignature property_signature = 101;
// For top-level callables, short name of "...Package$src$..." class with the callable's body and annotations
optional int32 src_class_name = 102;
}
compiler/frontend.java/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
+13
View File
@@ -9,6 +9,7 @@ public final class JavaProtoBuf {
com.google.protobuf.ExtensionRegistryLite registry) {
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.methodSignature);
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.propertySignature);
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.srcClassName);
}
public interface JavaTypeOrBuilder
extends com.google.protobuf.MessageLiteOrBuilder {
@@ -1979,6 +1980,18 @@ public final class JavaProtoBuf {
null,
101,
com.google.protobuf.WireFormat.FieldType.MESSAGE);
public static final int SRC_CLASS_NAME_FIELD_NUMBER = 102;
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
java.lang.Integer> srcClassName = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
0,
null,
null,
102,
com.google.protobuf.WireFormat.FieldType.INT32);
static {
}
compiler/frontend.java/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java
+14
View File
@@ -105,6 +105,12 @@ public class JavaProtoBufUtil {
}
}
@Nullable
public static Name loadSrcClassName(@NotNull ProtoBuf.Callable proto, @NotNull NameResolver nameResolver) {
if (!proto.hasExtension(JavaProtoBuf.srcClassName)) return null;
return nameResolver.getName(proto.getExtension(JavaProtoBuf.srcClassName));
}
public static void saveMethodSignature(@NotNull ProtoBuf.Callable.Builder proto, @NotNull Method method, @NotNull NameTable nameTable) {
proto.setExtension(JavaProtoBuf.methodSignature, new Serializer(nameTable).methodSignature(method));
}
@@ -122,6 +128,14 @@ public class JavaProtoBufUtil {
new Serializer(nameTable).propertySignature(fieldType, fieldName, syntheticMethodName, getter, setter));
}
public static void saveSrcClassName(
@NotNull ProtoBuf.Callable.Builder proto,
@NotNull Name name,
@NotNull NameTable nameTable
) {
proto.setExtension(JavaProtoBuf.srcClassName, nameTable.getSimpleNameIndex(name));
}
private static class Serializer {
private final NameTable nameTable;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java
+24 -1
View File
@@ -184,7 +184,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
MemberSignature signature = getCallableSignature(proto, nameResolver, kind);
if (signature == null) return Collections.emptyList();
VirtualFile file = findVirtualFileByDescriptor(container);
VirtualFile file = getVirtualFileWithMemberAnnotations(container, proto, nameResolver);
try {
// TODO: calculate this only once for each container
@@ -198,6 +198,29 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
}
}
@NotNull
private VirtualFile getVirtualFileWithMemberAnnotations(
@NotNull ClassOrNamespaceDescriptor container,
@NotNull ProtoBuf.Callable proto,
@NotNull NameResolver nameResolver
) {
if (container instanceof NamespaceDescriptor) {
Name name = JavaProtoBufUtil.loadSrcClassName(proto, nameResolver);
if (name != null) {
// To locate a package$src class, we first find the facade virtual file (*Package.class) and then look up the $src file in
// the same directory. This hack is needed because FileManager doesn't find classfiles for $src classes
VirtualFile facadeFile = findVirtualFileByPackage((NamespaceDescriptor) container);
VirtualFile srcFile = facadeFile.getParent().findChild(name + ".class");
if (srcFile != null) {
return srcFile;
}
}
}
return findVirtualFileByDescriptor(container);
}
@Nullable
private static MemberSignature getCallableSignature(
@NotNull ProtoBuf.Callable proto,
compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt
+5
View File
@@ -0,0 +1,5 @@
package test
annotation class Anno
[Anno] var property: Int = 42
compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.txt
+9
View File
@@ -0,0 +1,9 @@
package test
test.Anno() internal var property: jet.Int
internal fun <get-property>(): jet.Int
internal fun <set-property>(/*0*/ <set-?>: jet.Int): jet.Unit
internal final annotation class Anno : jet.Annotation {
/*primary*/ public constructor Anno()
}
compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt
+6
View File
@@ -0,0 +1,6 @@
package test
annotation class Anno
[Anno] val property: Int
get() = 42
compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.txt
+8
View File
@@ -0,0 +1,8 @@
package test
test.Anno() internal val property: jet.Int
internal fun <get-property>(): jet.Int
internal final annotation class Anno : jet.Annotation {
/*primary*/ public constructor Anno()
}
compiler/tests/org/jetbrains/jet/descriptors/serialization/DescriptorSerializationTestGenerated.java
+10
View File
@@ -141,6 +141,16 @@ public class DescriptorSerializationTestGenerated extends AbstractDescriptorSeri
doTest("compiler/testData/loadKotlin/annotations/packageMembers/Getter.kt");
}
@TestMetadata("PropertyField.kt")
public void testPropertyField() throws Exception {
doTest("compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt");
}
@TestMetadata("PropertyNoField.kt")
public void testPropertyNoField() throws Exception {
doTest("compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt");
}
@TestMetadata("Setter.kt")
public void testSetter() throws Exception {
doTest("compiler/testData/loadKotlin/annotations/packageMembers/Setter.kt");
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
+10
View File
@@ -141,6 +141,16 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Getter.kt");
}
@TestMetadata("PropertyField.kt")
public void testPropertyField() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt");
}
@TestMetadata("PropertyNoField.kt")
public void testPropertyNoField() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt");
}
@TestMetadata("Setter.kt")
public void testSetter() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Setter.kt");
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+10
View File
@@ -143,6 +143,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Getter.kt");
}
@TestMetadata("PropertyField.kt")
public void testPropertyField() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt");
}
@TestMetadata("PropertyNoField.kt")
public void testPropertyNoField() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt");
}
@TestMetadata("Setter.kt")
public void testSetter() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Setter.kt");