commit 2876623654681dde5c0bd94ac91346db93aa1f1f
author Lasse R.H. Nielsen <lrn@google.com> Mon Jun 25 19:43:14 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Jun 25 19:43:14 2018 +0000
tree 3ca40731b472419a92f92219cb6661970c7caff2
parent 6d25212302dae1c042a728187871c4c61f4a1cc1

Check function types in the correct order in runZoned.

A change made it check for a unary function type before a binary, so `(o, [stack])=>...` would not get a stack trace.

Fixes #33589

Bug: http://dartbug.com/33589
Change-Id: I69793eb74501c1f7fe07b6c90115b2f90f4d95df
Reviewed-on: https://dart-review.googlesource.com/61936
Reviewed-by: Florian Loitsch <floitsch@google.com>
Commit-Queue: Lasse R.H. Nielsen <lrn@google.com>

sdk/lib/async/zone.dart

diff --git a/sdk/lib/async/zone.dart b/sdk/lib/async/zone.dart
index f875f0c..dad3151 100644
--- a/sdk/lib/async/zone.dart
+++ b/sdk/lib/async/zone.dart
@@ -1466,10 +1466,10 @@
   }
   void Function(Object) unaryOnError;
   void Function(Object, StackTrace) binaryOnError;
-  if (onError is void Function(Object)) {
-    unaryOnError = onError;
-  } else if (onError is void Function(Object, StackTrace)) {
+  if (onError is void Function(Object, StackTrace)) {
     binaryOnError = onError;
+  } else if (onError is void Function(Object)) {
+    unaryOnError = onError;
   } else {
     throw new ArgumentError("onError callback must take either an Object "
         "(the error), or both an Object (the error) and a StackTrace.");

tests/lib_2/async/run_zoned8_test.dart

diff --git a/tests/lib_2/async/run_zoned8_test.dart b/tests/lib_2/async/run_zoned8_test.dart
index 450eff6..fca3989 100644
--- a/tests/lib_2/async/run_zoned8_test.dart
+++ b/tests/lib_2/async/run_zoned8_test.dart
@@ -24,8 +24,9 @@
       events.add(counter);
       throw counter;
     });
-  }, onError: (e) {
+  }, onError: (e, [s]) {
     events.add("error: $e");
+    Expect.isNotNull(s); // Regression test for http://dartbug.com/33589
   });
 
   done.future.whenComplete(() {