From 83fdfde1409a255848a28aa8f29f4c3f86258e4e Mon Sep 17 00:00:00 2001
From: asiva <asiva@google.com>
Date: Wed, 5 Feb 2020 22:48:50 +0000
Subject: [PATCH] [VM/libraries] - Fix signature of waitFor.

This should fix issue 40472.

Bug: 40472
Change-Id: I5cfa7cf25778b6a5430168707dd9370b202d3e6d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134565
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Siva Annamalai <asiva@google.com>
---
 sdk_nnbd/lib/cli/wait_for.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk_nnbd/lib/cli/wait_for.dart b/sdk_nnbd/lib/cli/wait_for.dart
index de3cce5f3ae..b24fd4dc2c9 100644
--- a/sdk_nnbd/lib/cli/wait_for.dart
+++ b/sdk_nnbd/lib/cli/wait_for.dart
@@ -111,12 +111,12 @@ class _WaitForUtils {
  * subsequent calls block waiting for a condition that is only satisfied when
  * an earlier call returns.
  */
-T? waitFor<T>(Future<T?> future, {Duration? timeout}) {
-  late T? result;
+T waitFor<T>(Future<T> future, {Duration? timeout}) {
+  late T result;
   bool futureCompleted = false;
   Object? error;
   StackTrace? stacktrace;
-  future.then((r) {
+  future.then((T r) {
     futureCompleted = true;
     result = r;
   }, onError: (e, st) {