Handle load errors in deferred code

runtime/bin/builtin.dart

 // Copyright (c) 2012, 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.
 
 library builtin;
 import 'dart:io';
 import 'dart:async';
 import 'dart:convert';
 // import 'root_library'; happens here from C Code
 
@@ skipping 90 matching lines @@
   } catch (error) {
     _requestFailed(error);
   }
   // TODO(floitsch): remove this line. It's just here to push an event on the
   // event loop so that we invoke the scheduled microtasks. Also remove the
   // import of dart:async when this line is not needed anymore.
   Timer.run(() {});
 }
 
 
-void _httpGet(Uri uri, loadCallback(List<int> data)) {
+void _httpGet(Uri uri, String libraryUri, loadCallback(List<int> data)) {
   var httpClient = new HttpClient();
   try {
     httpClient.getUrl(uri)
       .then((HttpClientRequest request) {
         request.persistentConnection = false;
         return request.close();
       })
       .then((HttpClientResponse response) {
         // Only create a ByteBuilder if multiple chunks are received.
         var builder = new BytesBuilder(copy: false);
         response.listen(
             builder.add,
             onDone: () {
               if (response.statusCode != 200) {
                 var msg = 'Failure getting $uri: '
                           '${response.statusCode} ${response.reasonPhrase}';
-                _asyncLoadError(uri.toString(), msg);
+                _asyncLoadError(uri.toString(), libraryUri, msg);
               }
 
               List<int> data = builder.takeBytes();
               httpClient.close();
               loadCallback(data);
             },
             onError: (error) {
-              _asyncLoadError(uri.toString(), error);
+              _asyncLoadError(uri.toString(), libraryUri, error);
             });
       })
       .catchError((error) {
-        _asyncLoadError(uri.toString(), error);
+        _asyncLoadError(uri.toString(), libraryUri, error);
       });
   } catch (error) {
-    _asyncLoadError(uri.toString(), error);
+    _asyncLoadError(uri.toString(), libraryUri, error);
   }
   // TODO(floitsch): remove this line. It's just here to push an event on the
   // event loop so that we invoke the scheduled microtasks. Also remove the
   // import of dart:async when this line is not needed anymore.
   Timer.run(() {});
 }
 
 
 // Are we running on Windows?
 var _isWindows = false;
@@ skipping 168 matching lines @@
   assert(_numOutstandingLoadRequests > 0);
   _numOutstandingLoadRequests--;
   _logResolution("native Builtin_LoadScript($uri) completed, "
                  "${_numOutstandingLoadRequests} requests remaining");
   if (_numOutstandingLoadRequests == 0) {
     _signalDoneLoading();
   }
 }
 
 
-void _asyncLoadErrorCallback(uri, error) native "Builtin_AsyncLoadError";
+void _asyncLoadErrorCallback(uri, libraryUri, error)
+    native "Builtin_AsyncLoadError";
 
-void _asyncLoadError(uri, error) {
+void _asyncLoadError(uri, libraryUri, error) {
   assert(_numOutstandingLoadRequests > 0);
+  _logResolution("_asyncLoadError($uri), error: $error");
   _numOutstandingLoadRequests--;
-  _asyncLoadErrorCallback(uri, error);
+  _asyncLoadErrorCallback(uri, libraryUri, error);
+  if (_numOutstandingLoadRequests == 0) {
+    _signalDoneLoading();
+  }
 }
 
 
 // Asynchronously loads script data (source or snapshot) through
 // an http or file uri.
 _loadDataAsync(String uri) {
   uri = _resolveScriptUri(uri);
   Uri sourceUri = Uri.parse(uri);
   _numOutstandingLoadRequests++;
   _logResolution("_loadDataAsync($uri), "
                  "${_numOutstandingLoadRequests} requests outstanding");
   if (sourceUri.scheme == 'http') {
-    _httpGet(sourceUri, (data) {
+    _httpGet(sourceUri, null, (data) {
       _loadScript(uri, data);
     });
   } else {
     var sourceFile = new File(_filePathFromUri(uri));
     sourceFile.readAsBytes().then((data) {
       _loadScript(uri, data);
     },
     onError: (e) {
-      _asyncLoadError(uri, e);
+      _asyncLoadError(uri, null, e);
     });
   }
 }
 
 
 void _loadLibrarySourceCallback(tag, uri, libraryUri, text)
     native "Builtin_LoadLibrarySource";
 
 void _loadLibrarySource(tag, uri, libraryUri, text) {
   // TODO: Currently a compilation error while loading the library is
@@ skipping 11 matching lines @@
 
 
 // Asynchronously loads source code through an http or file uri.
 _loadSourceAsync(int tag, String uri, String libraryUri) {
   var filePath = _filePathFromUri(uri);
   Uri sourceUri = Uri.parse(filePath);
   _numOutstandingLoadRequests++;
   _logResolution("_loadLibrarySource($uri), "
                  "${_numOutstandingLoadRequests} requests outstanding");
   if (sourceUri.scheme == 'http') {
-    _httpGet(sourceUri, (data) {
+    _httpGet(sourceUri, libraryUri, (data) {
       var text = UTF8.decode(data);
       _loadLibrarySource(tag, uri, libraryUri, text);
     });
   } else {
     var sourceFile = new File(filePath);
     sourceFile.readAsString().then((text) {
       _loadLibrarySource(tag, uri, libraryUri, text);
     },
     onError: (e) {
-      _asyncLoadError(uri, e);
+      _asyncLoadError(uri, libraryUri, e);
     });
   }
 }
 
 
 // Returns the directory part, the filename part, and the name
 // of a native extension URL as a list [directory, filename, name].
 // The directory part is either a file system path or an HTTP(S) URL.
 // The filename part is the extension name, with the platform-dependent
 // prefixes and extensions added.
@@ skipping 30 matching lines @@
   } else if (Platform.isWindows) {
     filename = '$name.dll';
   } else {
     _logResolution(
         'Native extensions not supported on ${Platform.operatingSystem}');
     throw 'Native extensions not supported on ${Platform.operatingSystem}';
   }
 
   return [path, filename, name];
 }