The type of a method invocation is the return type after capture conv…

…ersion

checker/tests/nullness/java-unsound/Figure3.java

@@ -12,7 +12,6 @@ <B> A coerce(B b) {
       // extends @Initialized @Nullable Object super @Initialized @NonNull Void]]
       // method return type: A[ extends @Initialized @Nullable Object super @Initialized
       // @NonNull Void]
-      // ::  error: (return)
       return pair(this.<B>bad(), b).value;
     }
   }

checker/tests/nullness/java-unsound/Figure3NC.java

@@ -11,7 +11,6 @@ class Constraint<B extends A> extends Type<B> {}
     }
 
     <B> A coerce(B b) {
-      // :: error: (return)
       return pair(this.<B>bad(), b).value;
     }
   }

framework/src/main/java/org/checkerframework/framework/type/TypeFromExpressionVisitor.java

@@ -326,7 +326,7 @@ public AnnotatedTypeMirror visitNewClass(NewClassTree node, AnnotatedTypeFactory
   public AnnotatedTypeMirror visitMethodInvocation(
       MethodInvocationTree node, AnnotatedTypeFactory f) {
     AnnotatedExecutableType ex = f.methodFromUse(node).executableType;
-    return ex.getReturnType().asUse();
+    return f.applyCaptureConversion(ex.getReturnType().asUse());
   }
 
   @Override

framework/tests/all-systems/Issue4829.java

@@ -0,0 +1,18 @@
+import java.util.concurrent.Future;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+@SuppressWarnings("all") // Just check for crashes.
+public class Issue4829 {
+
+  interface ListenableFuture<V extends @Nullable Object> extends Future<V> {}
+
+  enum E {}
+
+  ListenableFuture<Object> f(E e) {
+    return g(e);
+  }
+
+  ListenableFuture<? super Object> g(E e) {
+    throw new AssertionError();
+  }
+}