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

1 files changed, 2 insertions, 6 deletions

diff --git a/runtime/thread-inl.h b/runtime/thread-inl.h
index 7aed8b0..49b7be9 100644
--- a/runtime/thread-inl.h
+++ b/runtime/thread-inl.h
@@ -83,9 +83,7 @@ inline ThreadState Thread::SetState(ThreadState new_state) {
 
 inline void Thread::AssertThreadSuspensionIsAllowable(bool check_locks) const {
   if (kIsDebugBuild) {
-    if (gAborting == 0) {
-      CHECK_EQ(0u, tls32_.no_thread_suspension) << tlsPtr_.last_no_thread_suspension_cause;
-    }
+    CHECK_EQ(0u, tls32_.no_thread_suspension) << tlsPtr_.last_no_thread_suspension_cause;
     if (check_locks) {
       bool bad_mutexes_held = false;
       for (int i = kLockLevelCount - 1; i >= 0; --i) {
@@ -99,9 +97,7 @@ inline void Thread::AssertThreadSuspensionIsAllowable(bool check_locks) const {
           }
         }
       }
-      if (gAborting == 0) {
-        CHECK(!bad_mutexes_held);
-      }
+      CHECK(!bad_mutexes_held);
     }
   }
 }