| Index: runtime/vm/object.cc
|
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
|
| index f674cd4b80669a4b9a64444e12601acb5135aed4..8365cbada9f96356d907c76acd5f651bbc1dec96 100644
|
| --- a/runtime/vm/object.cc
|
| +++ b/runtime/vm/object.cc
|
| @@ -899,7 +899,7 @@ void Object::InitVmIsolateSnapshotObjectTable(intptr_t len) {
|
| void Object::MakeUnusedSpaceTraversable(const Object& obj,
|
| intptr_t original_size,
|
| intptr_t used_size) {
|
| - ASSERT(Isolate::Current()->no_safepoint_scope_depth() > 0);
|
| + ASSERT(Thread::Current()->no_safepoint_scope_depth() > 0);
|
| ASSERT(!obj.IsNull());
|
| ASSERT(original_size >= used_size);
|
| if (original_size > used_size) {
|
| @@ -14301,7 +14301,7 @@ bool Instance::IsIdenticalTo(const Instance& other) const {
|
|
|
|
|
| intptr_t* Instance::NativeFieldsDataAddr() const {
|
| - ASSERT(Isolate::Current()->no_safepoint_scope_depth() > 0);
|
| + ASSERT(Thread::Current()->no_safepoint_scope_depth() > 0);
|
| RawTypedData* native_fields =
|
| reinterpret_cast<RawTypedData*>(*NativeFieldsAddr());
|
| if (native_fields == TypedData::null()) {
|
| @@ -14450,7 +14450,7 @@ const char* Instance::ToCString() const {
|
| return "unknown_constant";
|
| } else if (raw() == Object::non_constant().raw()) {
|
| return "non_constant";
|
| - } else if (Isolate::Current()->no_safepoint_scope_depth() > 0) {
|
| + } else if (Thread::Current()->no_safepoint_scope_depth() > 0) {
|
| // Can occur when running disassembler.
|
| return "Instance";
|
| } else {
|
|
|