commit 2b46bc9cc94ce98eb59864a14857a4b50c0c9b5c
author ricow@google.com <ricow@google.com> Tue Mar 17 13:44:10 2015 +0000
committer ricow@google.com <ricow@google.com> Wed May 27 13:38:59 2015 -0700
tree b8e79e80bf91f5667e7f86499cc6550ebf928dd8
parent 2301150bf1b22884b4a505556e6b36a0b3171138

Version 1.9.0-dev.10.9

Merge cl from:
https://codereview.chromium.org/1011033003/

git-svn-id: http://dart.googlecode.com/svn/trunk@44532 260f80e4-7a28-3924-810f-c04153c831b5

runtime/bin/builtin.dart

diff --git a/runtime/bin/builtin.dart b/runtime/bin/builtin.dart
index 27d751a..d8c586c 100644
--- a/runtime/bin/builtin.dart
+++ b/runtime/bin/builtin.dart
@@ -350,7 +350,7 @@
   _finishedOneLoadRequest(uri);
 }
 
-void _asyncLoadError(int tag, String uri, String libraryUri, LoadError error) {
+void _asyncLoadError(tag, uri, libraryUri, error) {
   if (_logBuiltin) {
     _print("_asyncLoadError($uri), error: $error");
   }
@@ -359,7 +359,7 @@
     // uri.
     libraryUri = uri;
   }
-  _asyncLoadErrorCallback(uri, libraryUri, error);
+  _asyncLoadErrorCallback(uri, libraryUri, new LoadError(error.toString()));
   _finishedOneLoadRequest(uri);
 }
 
@@ -373,15 +373,10 @@
     if (dataOrError is List<int>) {
       _loadScript(tag, uri, libraryUri, dataOrError);
     } else {
-      assert(dataOrError is String);
-      var error = new LoadError(dataOrError.toString());
-      _asyncLoadError(tag, uri, libraryUri, error);
+      _asyncLoadError(tag, uri, libraryUri, dataOrError);
     }
   }).catchError((e) {
-    // Wrap inside a LoadError unless we are already propagating a previously
-    // seen LoadError.
-    var error = (e is LoadError) ? e : new LoadError(e.toString);
-    _asyncLoadError(tag, uri, libraryUri, error);
+    _asyncLoadError(tag, uri, libraryUri, e.toString());
   });
 
   try {
@@ -392,10 +387,7 @@
     if (_logBuiltin) {
       _print("Exception when communicating with service isolate: $e");
     }
-    // Wrap inside a LoadError unless we are already propagating a previously
-    // seen LoadError.
-    var error = (e is LoadError) ? e : new LoadError(e.toString);
-    _asyncLoadError(tag, uri, libraryUri, error);
+    _asyncLoadError(tag, uri, libraryUri, e.toString());
     receivePort.close();
   }
 }

tests/language/language.status

diff --git a/tests/language/language.status b/tests/language/language.status
index a4b2459..60eafb7 100644
--- a/tests/language/language.status
+++ b/tests/language/language.status
@@ -41,11 +41,6 @@
 cyclic_type2_test: Fail, OK
 least_upper_bound_expansive_test/*: Fail, OK
 
-[ $compiler == none || ($compiler == dart2dart && $builder_tag != new_backend) ]
-async_throw_in_catch_test: Crash, RuntimeError # Issue 21404 or it could be a test error
-
-[ $compiler == none && ($runtime == drt || $runtime == dartium|| $runtime == ContentShellOnAndroid) ]
-
 [ $compiler == none && $runtime == vm ]
 class_keyword_test/02: MissingCompileTimeError # Issue 13627
 unicode_bom_test: Fail # Issue 16067

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index db3bd8d..26e0d2a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 9
 PATCH 0
 PRERELEASE 10
-PRERELEASE_PATCH 8
+PRERELEASE_PATCH 9