tweak

Author: msridhar

nullaway/src/main/java/com/uber/nullaway/generics/TypeSubstitutionUtils.java

@@ -7,6 +7,7 @@
 import com.google.common.base.Verify;
 import com.google.errorprone.VisitorState;
 import com.sun.tools.javac.code.Attribute;
+import com.sun.tools.javac.code.BoundKind;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.TypeMetadata;
@@ -293,7 +294,7 @@ public Type visitMethodType(Type.MethodType t, Type other) {
     @Override
     public Type visitClassType(Type.ClassType t, Type other) {
       if (other instanceof Type.WildcardType wt) {
-        if (wt.isExtendsBound()) {
+        if (wt.kind.equals(BoundKind.EXTENDS)) {
           // As a temporary measure, we restore nullability annotations from the upper bound of the
           // wildcard.
           // TODO revisit this decision when we add fuller support for inference and wildcards.

nullaway/src/test/java/com/uber/nullaway/jspecify/GenericMethodLambdaOrMethodRefArgTests.java

@@ -445,7 +445,6 @@ public void genericMethodMethodRefWildCard() {
             import java.util.function.Function;
             @NullMarked
             class Test {
-                class Foo<T extends @Nullable Object> {}
                 static <T, R> R invokeWithReturn(Function <? super T, ? extends @Nullable R> mapper) {
                     throw new RuntimeException();
                 }