Fix deannotation of wildcard types

Previously type annotations were being preserved on the upper and lower bounds of wildcard types. PiperOrigin-RevId: 599910757
google · Jan 19, 2024 · 62d9e65 · 62d9e65
1 parent d3b0c98
commit 62d9e65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/java/com/google/turbine/types/Deannotate.java b/java/com/google/turbine/types/Deannotate.java
@@ -68,9 +68,9 @@ private static Type deannotateWildTy(Type.WildTy ty) {
       case NONE:
         return Type.WildUnboundedTy.create(ImmutableList.of());
       case LOWER:
-        return Type.WildLowerBoundedTy.create(ty.bound(), ImmutableList.of());
+        return Type.WildLowerBoundedTy.create(deannotate(ty.bound()), ImmutableList.of());
       case UPPER:
-        return Type.WildUpperBoundedTy.create(ty.bound(), ImmutableList.of());
+        return Type.WildUpperBoundedTy.create(deannotate(ty.bound()), ImmutableList.of());
     }
     throw new AssertionError(ty.boundKind());
   }

diff --git a/javatests/com/google/turbine/processing/AbstractTurbineTypesTest.java b/javatests/com/google/turbine/processing/AbstractTurbineTypesTest.java
@@ -244,6 +244,8 @@ protected static TypeParameters typeParameters() throws Exception {
       annotatedTypes.add("@A List");
       annotatedTypes.add("@A List<@A int @B []>");
       annotatedTypes.add("Map.@A Entry<@B Integer, @C Number>");
+      annotatedTypes.add("@A List<@B ? extends @C String>");
+      annotatedTypes.add("@A List<@B ? super @C String>");
     }
 
     List<String> files = new ArrayList<>();