Index: runtime/lib/mirrors.cc |
diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc |
index 33af2717f8a97e10db31046f1d1bde7e427611ba..e7236ed3c8844027caa7acc7d81c870f5556d314 100644 |
--- a/runtime/lib/mirrors.cc |
+++ b/runtime/lib/mirrors.cc |
@@ -384,6 +384,21 @@ static RawInstance* CreateLibraryMirror(const Library& lib) { |
// Censored library (grumble). |
return Instance::null(); |
} |
+ if (str.Equals("dart:io")) { |
+ // Hack around dart:io being loaded into non-service isolates in Dartium. |
+ Isolate* isolate = Isolate::Current(); |
siva
2015/08/03 23:37:21
We are trying to deprecate the Isolate api when cr
rmacnak
2015/08/03 23:59:20
Done.
|
+ const GrowableObjectArray& libraries = GrowableObjectArray::Handle( |
+ isolate, isolate->object_store()->libraries()); |
+ Library& other_lib = Library::Handle(isolate); |
+ String& other_uri = String::Handle(isolate); |
+ for (intptr_t i = 0; i < libraries.Length(); i++) { |
+ other_lib ^= libraries.At(i); |
+ other_uri = other_lib.url(); |
+ if (other_uri.Equals("dart:html")) { |
+ return Instance::null(); |
+ } |
+ } |
+ } |
args.SetAt(2, str); |
return CreateMirror(Symbols::_LocalLibraryMirror(), args); |
} |