summaryrefslogtreecommitdiffstats
path: root/runtime/thread.cc
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-12-04 19:53:52 -0800
committerIan Rogers <irogers@google.com>2014-12-04 20:04:45 -0800
commit015b137efb434528173779bc3ec8d72494456254 (patch)
tree2ccaba9d7465bd9995082a7251d34cf76b1ab1ea /runtime/thread.cc
parenta21fdd0432aa38b63d144ee4b92b6a567aab61d2 (diff)
downloadart-015b137efb434528173779bc3ec8d72494456254.tar.gz
art-015b137efb434528173779bc3ec8d72494456254.tar.bz2
art-015b137efb434528173779bc3ec8d72494456254.zip
Tidy gAborting.
Reduce scope to Runtime::Abort and short-cut recursive case earlier. gAborting remains global to avoid two fatal errors in thread and the verifier. Change-Id: Ibc893f891ffee9a763c65cde9507d99083d47b3f
Diffstat (limited to 'runtime/thread.cc')
-rw-r--r--runtime/thread.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc
index f7c710695a..a6e5b0c18b 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -742,7 +742,7 @@ void Thread::DumpState(std::ostream& os, const Thread* thread, pid_t tid) {
// Don't do this if we are aborting since the GC may have all the threads suspended. This will
// cause ScopedObjectAccessUnchecked to deadlock.
- if (gAborting == 0 && self != nullptr && thread != nullptr && thread->tlsPtr_.opeer != nullptr) {
+ if (self != nullptr && thread != nullptr && thread->tlsPtr_.opeer != nullptr) {
ScopedObjectAccessUnchecked soa(self);
priority = soa.DecodeField(WellKnownClasses::java_lang_Thread_priority)
->GetInt(thread->tlsPtr_.opeer);