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

Unified Diff: runtime/vm/isolate.cc

Issue 290713004: First step towards asynchronous loading of sources (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 7 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 | « runtime/vm/flags.cc ('k') | tests/co19/co19-runtime.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate.cc
===================================================================
--- runtime/vm/isolate.cc (revision 36574)
+++ runtime/vm/isolate.cc (working copy)
@@ -187,7 +187,12 @@
Function::Handle(isolate_, lib.LookupLocalFunction(callback_name));
if (func.IsNull()) {
lib = isolate_->object_store()->root_library();
- func = lib.LookupLocalFunction(callback_name);
+ // Note: bootstrap code in builtin library may attempt to resolve a
+ // callback function before the script is fully loaded, in which case
+ // the root library may not be registered yet.
+ if (!lib.IsNull()) {
+ func = lib.LookupLocalFunction(callback_name);
+ }
}
return func.raw();
}
« no previous file with comments | « runtime/vm/flags.cc ('k') | tests/co19/co19-runtime.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698