[dart2js] (Old RTI) Check function subtypes after checking for FutureOr.

fishythefish · commit-bot@chromium.org · commit af5a466e3bdc · 2019-08-09T02:41:30.000Z
Change-Id: I7d2feab60295304377e48fddce901aea1c79ce19 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112481 Reviewed-by: Stephen Adams <sra@google.com>
diff --git a/sdk/lib/_internal/js_runtime/lib/js_rti.dart b/sdk/lib/_internal/js_runtime/lib/js_rti.dart
@@ -713,16 +713,6 @@ bool _isSubtype(var s, var sEnv, var t, var tEnv) {
 
   if (isNullType(s)) return true;
 
-  if (isDartFunctionType(t)) {
-    return _isFunctionSubtype(s, sEnv, t, tEnv);
-  }
-
-  if (isDartFunctionType(s)) {
-    // Check function types against the `Function` class (`Object` is also a
-    // supertype, but is tested above with other 'top' types.).
-    return isDartFunctionTypeRti(t);
-  }
-
   // Get the object describing the class and check for the subtyping flag
   // constructed from the type of [s].
   var typeOfS = isJsArray(s) ? getIndex(s, 0) : s;
@@ -755,6 +745,16 @@ bool _isSubtype(var s, var sEnv, var t, var tEnv) {
     }
   }
 
+  if (isDartFunctionType(t)) {
+    return _isFunctionSubtype(s, sEnv, t, tEnv);
+  }
+
+  if (isDartFunctionType(s)) {
+    // Check function types against the `Function` class (`Object` is also a
+    // supertype, but is tested above with other 'top' types.).
+    return isDartFunctionTypeRti(t);
+  }
+
   // Get the object describing the class and check for the subtyping flag
   // constructed from the type of [t].
   var typeOfT = isJsArray(t) ? getIndex(t, 0) : t;
diff --git a/tests/language_2/future_or_function_test.dart b/tests/language_2/future_or_function_test.dart
@@ -0,0 +1,10 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+import 'package:expect/expect.dart';
+
+main() {
+  Expect.subtype<void Function(), FutureOr<void Function()>>();
+}
