Chromium Code Reviews| Index: runtime/vm/object.cc |
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc |
| index bbcb076cd129b99209ae0698eb5c3cde27ec67ba..1d3fe7d09d2f656c4b12b549fe88b7c7ee94aa1b 100644 |
| --- a/runtime/vm/object.cc |
| +++ b/runtime/vm/object.cc |
| @@ -18327,8 +18327,9 @@ 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()); |
| + (Isolate::Current()->object_store() != NULL && |
|
Cutch
2014/12/11 23:47:01
Parens around Isolate::Current()->object_store() !
turnidge
2014/12/12 17:48:29
Done.
|
| + Isolate::Current()->object_store()->one_byte_string_class() != |
|
Cutch
2014/12/11 23:47:01
Parens around Isolate::Current()->object_store()->
turnidge
2014/12/12 17:48:29
Done.
|
| + 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); |