Fix some JDWP bugs related to locking and getting statics.
Gave all JDWP locks an explicit level to prevent them from using the
default. Also made sure the class of the field would be passed to
GetObject instead of NULL for statics. There's still a number of test
failures in JDWP.
Change-Id: I6134be2a99d4a0968f9719f620864a3c176b4a58
diff --git a/src/locks.h b/src/locks.h
index cd2f8b7..c009f1d 100644
--- a/src/locks.h
+++ b/src/locks.h
@@ -37,17 +37,19 @@
kThreadSuspendCountLock = 2,
kAbortLock = 3,
kDefaultMutexLevel = 4,
- kJdwpSerialLock = 5,
- kAllocSpaceLock = 6,
- kLoadLibraryLock = 7,
- kClassLinkerClassesLock = 8,
- kThreadListLock = 9,
- kRuntimeShutdownLock = 10,
- kHeapBitmapLock = 11,
- kMonitorLock = 12,
- kMutatorLock = 13,
- kZygoteCreationLock = 14,
- kMaxMutexLevel = kMutatorLock,
+ kJdwpAttachLock = 5,
+ kJdwpStartLock = 6,
+ kJdwpSerialLock = 7,
+ kAllocSpaceLock = 8,
+ kLoadLibraryLock = 9,
+ kClassLinkerClassesLock = 10,
+ kThreadListLock = 11,
+ kRuntimeShutdownLock = 12,
+ kHeapBitmapLock = 13,
+ kMonitorLock = 14,
+ kMutatorLock = 15,
+ kZygoteCreationLock = 16,
+ kMaxMutexLevel = kZygoteCreationLock,
};
std::ostream& operator<<(std::ostream& os, const LockLevel& rhs);