commit 8c5e2dad9f585562f6a5b3ed2242a5d4a11fce3c
author Alex Light <allight@google.com> Tue Jul 11 10:32:20 2017 -0700
committer Alex Light <allight@google.com> Tue Jul 11 17:55:33 2017 +0000
tree b5e05e9b6fc2a2682d26c27d873c719fda03fd63
parent 733e441e3bcaa6efb8248fe3429b18d3199ee30e

Move ThreadDeath event before clearing Thread.nativePeer

We were clearing the Thread.nativePeer field prior to calling
ThreadDeath event. Since this event can call into user-supplied code
we want to call it before we do any real cleanup.

Test: ./test.py --host -j40
Bug: 62117833

Change-Id: I6b93d82d23946c07dfbeb837d841339108e4b084

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 36ecd33..fc30832 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -2134,6 +2134,10 @@
     ScopedObjectAccess soa(self);
     // We may need to call user-supplied managed code, do this before final clean-up.
     HandleUncaughtExceptions(soa);
+    Runtime* runtime = Runtime::Current();
+    if (runtime != nullptr) {
+      runtime->GetRuntimeCallbacks()->ThreadDeath(self);
+    }
     RemoveFromThreadGroup(soa);
 
     // this.nativePeer = 0;
@@ -2144,11 +2148,6 @@
       jni::DecodeArtField(WellKnownClasses::java_lang_Thread_nativePeer)
           ->SetLong<false>(tlsPtr_.opeer, 0);
     }
-    Runtime* runtime = Runtime::Current();
-    if (runtime != nullptr) {
-      runtime->GetRuntimeCallbacks()->ThreadDeath(self);
-    }
-
 
     // Thread.join() is implemented as an Object.wait() on the Thread.lock object. Signal anyone
     // who is waiting.