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

Unified Diff: runtime/vm/object.cc

Issue 1814623003: Remove Code::active_instructions_. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/raw_object.h » ('j') | 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 d2ceb636311b0981295abd508214407ee4e7b05b..fba7a28bedb2800880ef89ff25990a0393c2c3b2 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -13509,9 +13509,10 @@ bool Code::IsFunctionCode() const {
void Code::DisableDartCode() const {
DEBUG_ASSERT(IsMutatorOrAtSafepoint());
ASSERT(IsFunctionCode());
- ASSERT(instructions() == active_instructions());
+ ASSERT(!IsDisabled());
const Code& new_code =
Code::Handle(StubCode::FixCallersTarget_entry()->code());
+ ASSERT(new_code.instructions()->IsVMHeapObject());
SetActiveInstructions(new_code.instructions());
}
@@ -13519,9 +13520,10 @@ void Code::DisableDartCode() const {
void Code::DisableStubCode() const {
ASSERT(Thread::Current()->IsMutatorThread());
ASSERT(IsAllocationStubCode());
- ASSERT(instructions() == active_instructions());
+ ASSERT(!IsDisabled());
const Code& new_code =
Code::Handle(StubCode::FixAllocationStubTarget_entry()->code());
+ ASSERT(new_code.instructions()->IsVMHeapObject());
SetActiveInstructions(new_code.instructions());
}
@@ -13530,7 +13532,6 @@ void Code::SetActiveInstructions(RawInstructions* instructions) const {
DEBUG_ASSERT(IsMutatorOrAtSafepoint() || !is_alive());
// RawInstructions are never allocated in New space and hence a
// store buffer update is not needed here.
- StorePointer(&raw_ptr()->active_instructions_, instructions);
StoreNonPointer(&raw_ptr()->entry_point_,
reinterpret_cast<uword>(instructions->ptr()) +
Instructions::HeaderSize());
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/raw_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698