commit | 7c378e4bc3aa6928f48d235e88e652e8b82beef4 | [log] [tgz] |
---|---|---|
author | Hiroshi Yamauchi <yamauchi@google.com> | Thu Dec 18 05:34:54 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Dec 18 05:34:54 2014 +0000 |
tree | 2bb34251789825d73799e410c09ea17487d39489 | |
parent | bf7b41ff04e5cf70660b50f7b7f2c14d94b8bf6d [diff] | |
parent | a1b94c6d06e3cf2aa4f3aa42a1133995a4d8a1fb [diff] |
Merge "Fix a race condition during the rosalloc verification."
diff --git a/runtime/thread.cc b/runtime/thread.cc index 2308cc9..4a7103b 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc
@@ -1210,7 +1210,10 @@ tlsPtr_.opeer = nullptr; } - Runtime::Current()->GetHeap()->RevokeThreadLocalBuffers(this); + { + ScopedObjectAccess soa(self); + Runtime::Current()->GetHeap()->RevokeThreadLocalBuffers(this); + } } Thread::~Thread() {