Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1318)

Unified Diff: pkg/compiler/lib/src/js_backend/backend.dart

Issue 929053005: Merge request - fixes dart2js async problems. Base URL: http://dart.googlecode.com/svn/trunk/dart/
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/compiler/lib/src/js/rewrite_async.dart ('k') | pkg/compiler/lib/src/ssa/builder.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/js_backend/backend.dart
===================================================================
--- pkg/compiler/lib/src/js_backend/backend.dart (revision 43839)
+++ pkg/compiler/lib/src/js_backend/backend.dart (working copy)
@@ -1600,8 +1600,8 @@
return findHelper("throwCyclicInit");
}
- Element getThenHelper() {
- return findHelper("thenHelper");
+ Element getAsyncHelper() {
+ return findHelper("asyncHelper");
}
Element getYieldStar() {
@@ -1616,10 +1616,16 @@
return classElement.lookupLocalMember("yieldSingle");
}
- Element getStreamHelper() {
- return findHelper("streamHelper");
+ Element getSyncStarUncaughtError() {
+ ClassElement classElement = findHelper("IterationMarker");
+ classElement.ensureResolved(compiler);
+ return classElement.lookupLocalMember("uncaughtError");
}
+ Element getAsyncStarHelper() {
+ return findHelper("asyncStarHelper");
+ }
+
Element getStreamOfController() {
return findHelper("streamOfController");
}
@@ -2405,7 +2411,7 @@
Enqueuer enqueuer,
Registry registry) {
if (element.asyncMarker == AsyncMarker.ASYNC) {
- enqueue(enqueuer, getThenHelper(), registry);
+ enqueue(enqueuer, getAsyncHelper(), registry);
enqueue(enqueuer, getCompleterConstructor(), registry);
enqueue(enqueuer, getStreamIteratorConstructor(), registry);
} else if (element.asyncMarker == AsyncMarker.SYNC_STAR) {
@@ -2413,9 +2419,10 @@
enqueue(enqueuer, getSyncStarIterableConstructor(), registry);
enqueue(enqueuer, getEndOfIteration(), registry);
enqueue(enqueuer, getYieldStar(), registry);
+ enqueue(enqueuer, getSyncStarUncaughtError(), registry);
} else if (element.asyncMarker == AsyncMarker.ASYNC_STAR) {
enqueuer.registerInstantiatedClass(getASyncStarController(), registry);
- enqueue(enqueuer, getStreamHelper(), registry);
+ enqueue(enqueuer, getAsyncStarHelper(), registry);
enqueue(enqueuer, getStreamOfController(), registry);
enqueue(enqueuer, getYieldSingle(), registry);
enqueue(enqueuer, getYieldStar(), registry);
« no previous file with comments | « pkg/compiler/lib/src/js/rewrite_async.dart ('k') | pkg/compiler/lib/src/ssa/builder.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698