Merge "Support VecLoad and VecStore in LSA."
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 88f1fc6..7b0ef80 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -288,12 +288,17 @@
#if HAVE_TIMED_RWLOCK
// Attempt to rectify locks so that we dump thread list with required locks before exiting.
NO_RETURN static void UnsafeLogFatalForThreadSuspendAllTimeout() {
+ // Increment gAborting before doing the thread list dump since we don't want any failures from
+ // AssertThreadSuspensionIsAllowable in cases where thread suspension is not allowed.
+ // See b/69044468.
+ ++gAborting;
Runtime* runtime = Runtime::Current();
std::ostringstream ss;
ss << "Thread suspend timeout\n";
Locks::mutator_lock_->Dump(ss);
ss << "\n";
runtime->GetThreadList()->Dump(ss);
+ --gAborting;
LOG(FATAL) << ss.str();
exit(0);
}