diff options
Diffstat (limited to 'runtime/thread.cc')
| -rw-r--r-- | runtime/thread.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index 59a38e161d..6f0776b6b5 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -2466,7 +2466,9 @@ Thread::~Thread() { Runtime::Current()->GetHeap()->ConcurrentCopyingCollector() ->AssertNoThreadMarkStackMapping(this); gc::accounting::AtomicStack<mirror::Object>* tl_mark_stack = GetThreadLocalMarkStack(); - CHECK(tl_mark_stack == nullptr) << "mark-stack: " << tl_mark_stack; + CHECK(tl_mark_stack == nullptr + || tl_mark_stack == reinterpret_cast<gc::accounting::AtomicStack<mirror::Object>*>(0x1)) + << "mark-stack: " << tl_mark_stack; } // Make sure we processed all deoptimization requests. CHECK(tlsPtr_.deoptimization_context_stack == nullptr) << "Missed deoptimization"; |