commit ea34d46b421c8ad7a226f0c094e717464bb141eb
author Lokesh Gidra <lokeshgidra@google.com> Mon Jan 28 17:23:04 2019 -0800
committer Lokesh Gidra <lokeshgidra@google.com> Mon Jan 28 17:23:04 2019 -0800
tree 110f287312d04570341d9823579fe34687dce072
parent b8f88f33b5ad0a593e5c63beab45d05f4c791bf4

Fix lock order issue with large-object space lock

We have a code-path where GC thread acquires large-object space lock (a
higher level lock) after acquire JNI global lock (a lower level lock).
Moving AllocSpaceLock to be lower than JniGlobalsLock to fix this.

Bug: 120782890
Test: art/test/testrunner/testrunner.py --host
Change-Id: I4f169c779cb17f6c14f6e5278857845f9904e62c

runtime/base/locks.h

diff --git a/runtime/base/locks.h b/runtime/base/locks.h
index 57719f1..b7d8e31 100644
--- a/runtime/base/locks.h
+++ b/runtime/base/locks.h
@@ -71,6 +71,7 @@
   kRosAllocGlobalLock,
   kRosAllocBracketLock,
   kRosAllocBulkFreeLock,
+  kAllocSpaceLock,
   kTaggingLockLevel,
   kTransactionLogLock,
   kCustomTlsLock,
@@ -84,7 +85,6 @@
   kReferenceQueueClearedReferencesLock,
   kReferenceProcessorLock,
   kJitDebugInterfaceLock,
-  kAllocSpaceLock,
   kBumpPointerSpaceBlockLock,
   kArenaPoolLock,
   kInternTableLock,