Index: runtime/vm/object.cc |
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc |
index 69810fdf5e52e4f1c0a9d0174e5082ef65af3f60..389132ed78c8ded2c0a656089d1f90031cfa13a8 100644 |
--- a/runtime/vm/object.cc |
+++ b/runtime/vm/object.cc |
@@ -1051,7 +1051,7 @@ void Object::FinalizeVMIsolate(Isolate* isolate) { |
WritableVMIsolateScope scope(Thread::Current()); |
PremarkingVisitor premarker; |
ASSERT(isolate->heap()->UsedInWords(Heap::kNew) == 0); |
- isolate->heap()->IterateOldObjectsNoEmbedderPages(&premarker); |
+ isolate->heap()->IterateOldObjectsNoExternalPages(&premarker); |
// Make the VM isolate read-only again after setting all objects as marked. |
} |
} |
@@ -3501,7 +3501,7 @@ TokenPosition Class::ComputeEndTokenPos() const { |
const TokenStream& tkns = TokenStream::Handle(zone, scr.tokens()); |
if (tkns.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return TokenPosition::kNoSource; |
} |
TokenStream::Iterator tkit(zone, tkns, token_pos(), |
@@ -7662,7 +7662,7 @@ RawString* Field::InitializingExpression() const { |
ASSERT(!scr.IsNull()); |
const TokenStream& tkns = TokenStream::Handle(zone, scr.tokens()); |
if (tkns.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return String::null(); |
} |
TokenStream::Iterator tkit(zone, tkns, token_pos()); |
@@ -8815,7 +8815,7 @@ RawString* Script::GenerateSource() const { |
const TokenStream& token_stream = TokenStream::Handle(tokens()); |
if (token_stream.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return String::null(); |
} |
return token_stream.GenerateSource(); |
@@ -9072,7 +9072,7 @@ void Script::GetTokenLocation(TokenPosition token_pos, |
const TokenStream& tkns = TokenStream::Handle(zone, tokens()); |
if (tkns.IsNull()) { |
- ASSERT((Dart::snapshot_kind() == Snapshot::kAppAOT)); |
+ ASSERT((Dart::vm_snapshot_kind() == Snapshot::kAppAOT)); |
*line = -1; |
if (column != NULL) { |
*column = -1; |
@@ -9230,7 +9230,7 @@ int32_t Script::SourceFingerprint(TokenPosition start, |
RawString* Script::GetLine(intptr_t line_number, Heap::Space space) const { |
const String& src = String::Handle(Source()); |
if (src.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return Symbols::OptimizedOut().raw(); |
} |
intptr_t relative_line_number = line_number - line_offset(); |
@@ -9280,7 +9280,7 @@ RawString* Script::GetSnippet(intptr_t from_line, |
intptr_t to_column) const { |
const String& src = String::Handle(Source()); |
if (src.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return Symbols::OptimizedOut().raw(); |
} |
intptr_t length = src.Length(); |
@@ -11211,7 +11211,7 @@ bool LibraryPrefix::LoadLibrary() const { |
} |
ASSERT(is_deferred_load()); |
ASSERT(num_imports() == 1); |
- if (Dart::snapshot_kind() == Snapshot::kAppAOT) { |
+ if (Dart::vm_snapshot_kind() == Snapshot::kAppAOT) { |
// The library list was tree-shaken away. |
this->set_is_loaded(); |
return true; |
@@ -12814,7 +12814,7 @@ const char* ICData::ToCString() const { |
RawFunction* ICData::Owner() const { |
Object& obj = Object::Handle(raw_ptr()->owner_); |
if (obj.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return Function::null(); |
} else if (obj.IsFunction()) { |
return Function::Cast(obj).raw(); |
@@ -14002,7 +14002,7 @@ RawTypedData* Code::GetDeoptInfoAtPc(uword pc, |
uword code_entry = instrs.PayloadStart(); |
const Array& table = Array::Handle(deopt_info_array()); |
if (table.IsNull()) { |
- ASSERT(Dart::snapshot_kind() == Snapshot::kAppAOT); |
+ ASSERT(Dart::vm_snapshot_kind() == Snapshot::kAppAOT); |
return TypedData::null(); |
} |
// Linear search for the PC offset matching the target PC. |