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

Unified Diff: runtime/vm/object.cc

Issue 802543002: Move notification of isolate creation until after the ObjectStore is initialized. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: code review Created 6 years 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/debugger.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index bbcb076cd129b99209ae0698eb5c3cde27ec67ba..2a0ae9218b7d29b9f00a491affb6701cc23ee9c6 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -18326,9 +18326,10 @@ RawOneByteString* ExternalOneByteString::EscapeSpecialCharacters(
RawOneByteString* OneByteString::New(intptr_t len,
Heap::Space space) {
- ASSERT(Isolate::Current() == Dart::vm_isolate() ||
- Isolate::Current()->object_store()->one_byte_string_class() !=
- Class::null());
+ ASSERT((Isolate::Current() == Dart::vm_isolate()) ||
+ ((Isolate::Current()->object_store() != NULL) &&
+ (Isolate::Current()->object_store()->one_byte_string_class() !=
+ Class::null())));
if (len < 0 || len > kMaxElements) {
// This should be caught before we reach here.
FATAL1("Fatal error in OneByteString::New: invalid len %" Pd "\n", len);
« no previous file with comments | « runtime/vm/debugger.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698