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

Unified Diff: runtime/vm/isolate.cc

Issue 2993863002: Fixes the regression caused by 7568e1f18e. (Closed)
Patch Set: Created 3 years, 4 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 | « no previous file | runtime/vm/scavenger.cc » ('j') | runtime/vm/scavenger.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 55720c97d681dcebdbff57a779d9c3dc8158d180..498c254ad1ff182ee1e88a18f0146b05e1e808ac 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -2575,7 +2575,8 @@ Thread* Isolate::ScheduleThread(bool is_mutator, bool bypass_safepoint) {
if (is_mutator) {
mutator_thread_ = thread;
if ((Dart::vm_isolate() != NULL) &&
rmacnak 2017/08/07 21:29:35 Isn't this always a no-op now? Either the Thread s
danunez 2017/08/07 23:09:59 This is a no-op. This will be deleted.
- (heap() != Dart::vm_isolate()->heap())) {
+ (heap() != Dart::vm_isolate()->heap()) &&
+ (!mutator_thread_->HasActiveTLAB())) {
mutator_thread_->set_top(0);
mutator_thread_->set_end(0);
}
@@ -2617,13 +2618,6 @@ void Isolate::UnscheduleThread(Thread* thread,
os_thread->set_thread(NULL);
OSThread::SetCurrent(os_thread);
if (is_mutator) {
- if ((Dart::vm_isolate() != NULL) &&
- (heap() != Dart::vm_isolate()->heap())) {
- if (mutator_thread_->HasActiveTLAB()) {
- heap()->AbandonRemainingTLAB(mutator_thread_);
- }
- }
- ASSERT(!mutator_thread_->HasActiveTLAB());
mutator_thread_ = NULL;
}
thread->isolate_ = NULL;
« no previous file with comments | « no previous file | runtime/vm/scavenger.cc » ('j') | runtime/vm/scavenger.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698