diff options
| -rw-r--r-- | java/com/google/turbine/binder/DisambiguateTypeAnnotations.java | 22 | ||||
| -rw-r--r-- | java/com/google/turbine/binder/bound/AnnotationMetadata.java | 2 |
2 files changed, 21 insertions, 3 deletions
diff --git a/java/com/google/turbine/binder/DisambiguateTypeAnnotations.java b/java/com/google/turbine/binder/DisambiguateTypeAnnotations.java index 309c94e..793f347 100644 --- a/java/com/google/turbine/binder/DisambiguateTypeAnnotations.java +++ b/java/com/google/turbine/binder/DisambiguateTypeAnnotations.java @@ -20,8 +20,10 @@ import static com.google.common.collect.Iterables.getOnlyElement; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; +import com.google.turbine.binder.bound.AnnotationMetadata; import com.google.turbine.binder.bound.SourceTypeBoundClass; import com.google.turbine.binder.bound.TurbineAnnotationValue; import com.google.turbine.binder.bound.TypeBoundClass; @@ -43,7 +45,6 @@ import com.google.turbine.type.Type.PrimTy; import com.google.turbine.type.Type.TyVar; import java.util.Collection; import java.util.Map; -import java.util.Set; /** * Disambiguate annotations on field, parameter, and method return types that could be declaration @@ -156,7 +157,7 @@ public class DisambiguateTypeAnnotations { annotations = groupRepeated(env, annotations); ImmutableList.Builder<AnnoInfo> typeAnnotations = ImmutableList.builder(); for (AnnoInfo anno : annotations) { - Set<TurbineElementType> target = env.get(anno.sym()).annotationMetadata().target(); + ImmutableSet<TurbineElementType> target = getTarget(env, anno); if (target.contains(TurbineElementType.TYPE_USE)) { typeAnnotations.add(anno); } @@ -167,6 +168,23 @@ public class DisambiguateTypeAnnotations { return addAnnotationsToType(type, typeAnnotations.build()); } + private static ImmutableSet<TurbineElementType> getTarget( + Env<ClassSymbol, TypeBoundClass> env, AnnoInfo anno) { + ClassSymbol sym = anno.sym(); + if (sym == null) { + return AnnotationMetadata.DEFAULT_TARGETS; + } + TypeBoundClass info = env.get(sym); + if (info == null) { + return AnnotationMetadata.DEFAULT_TARGETS; + } + AnnotationMetadata metadata = info.annotationMetadata(); + if (metadata == null) { + return AnnotationMetadata.DEFAULT_TARGETS; + } + return metadata.target(); + } + private static ImmutableList<FieldInfo> bindFields( Env<ClassSymbol, TypeBoundClass> env, ImmutableList<FieldInfo> fields) { ImmutableList.Builder<FieldInfo> result = ImmutableList.builder(); diff --git a/java/com/google/turbine/binder/bound/AnnotationMetadata.java b/java/com/google/turbine/binder/bound/AnnotationMetadata.java index 9c81a5f..31860b6 100644 --- a/java/com/google/turbine/binder/bound/AnnotationMetadata.java +++ b/java/com/google/turbine/binder/bound/AnnotationMetadata.java @@ -30,7 +30,7 @@ import java.util.EnumSet; */ public class AnnotationMetadata { - private static final ImmutableSet<TurbineElementType> DEFAULT_TARGETS = getDefaultElements(); + public static final ImmutableSet<TurbineElementType> DEFAULT_TARGETS = getDefaultElements(); private static ImmutableSet<TurbineElementType> getDefaultElements() { EnumSet<TurbineElementType> values = EnumSet.allOf(TurbineElementType.class); |