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

Unified Diff: runtime/vm/object.cc

Issue 1390153004: Move deopt_id and related helpers/definitions from Isolate to Thread (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 months 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
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 6bb41a52a58990800e591dfdc3f66db293d773b2..269253aef321b781c93fbaef4c4483d02f72299e 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -11337,7 +11337,7 @@ void PcDescriptors::Verify(const Function& function) const {
Iterator iter(*this, RawPcDescriptors::kDeopt | RawPcDescriptors::kIcCall);
while (iter.MoveNext()) {
// 'deopt_id' is set for kDeopt and kIcCall and must be unique for one kind.
- if (Isolate::IsDeoptAfter(iter.DeoptId())) {
+ if (Thread::IsDeoptAfter(iter.DeoptId())) {
// TODO(vegorov): some instructions contain multiple calls and have
// multiple "after" targets recorded. Right now it is benign but might
// lead to issues in the future. Fix that and enable verification.
@@ -12501,7 +12501,7 @@ RawICData* ICData::New() {
NoSafepointScope no_safepoint;
result ^= raw;
}
- result.set_deopt_id(Isolate::kNoDeoptId);
+ result.set_deopt_id(Thread::kNoDeoptId);
result.set_state_bits(0);
return result.raw();
}
@@ -13256,7 +13256,7 @@ intptr_t Code::GetDeoptIdForOsr(uword pc) const {
return iter.DeoptId();
}
}
- return Isolate::kNoDeoptId;
+ return Thread::kNoDeoptId;
}

Powered by Google App Engine
This is Rietveld 408576698