Skip to content
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ private final AnnotationMirror lowestQualifier(AnnotationMirror qual1, Annotatio
AnnotatedTypeVariable typeVar,
AnnotationMirror top,
boolean canCombinedSetBeMissingAnnos) {
if (typeVar == null) {
return annotation;
}

AnnotationMirror upperBound = typeVar.getEffectiveAnnotationInHierarchy(top);
TypeMirror upperBoundTM = typeVar.getUpperBound().getUnderlyingType();
Expand Down Expand Up @@ -591,6 +594,9 @@ public ValueLub(boolean shouldWiden) {
AnnotatedTypeVariable typeVar,
AnnotationMirror top,
boolean canCombinedSetBeMissingAnnos) {
if (typeVar == null) {
return annotation;
}
TypeMirror typeVarTM = typeVar.getUnderlyingType();
if (canCombinedSetBeMissingAnnos) {
// anno is the primary annotation on the use of a type variable. typeVar is a use of
Expand Down Expand Up @@ -700,6 +706,9 @@ protected class ValueGlb extends AnnotationSetCombiner {
AnnotatedTypeVariable typeVar,
AnnotationMirror top,
boolean canCombinedSetBeMissingAnnos) {
if (typeVar == null) {
return annotation;
}
TypeMirror typeVarTM = typeVar.getUnderlyingType();
if (canCombinedSetBeMissingAnnos) {
// anno is the primary annotation on the use of a type variable. typeVar is a use of
Expand Down
Loading