ClassLinker changes
- Add ClassLinker::LockOwner for SignalCatcher
- ClassLinker::ResolveMethod now sets CodeAndDirectMethod when code is available
Change-Id: I404b80d1994808e018d00e0b30e8ba4f9d08fecc
diff --git a/src/monitor.cc b/src/monitor.cc
index d428564..aede4b8 100644
--- a/src/monitor.cc
+++ b/src/monitor.cc
@@ -866,7 +866,7 @@
}
}
-uint32_t Monitor::GetLockOwner(uint32_t raw_lock_word) {
+uint32_t Monitor::GetThinLockId(uint32_t raw_lock_word) {
if (LW_SHAPE(raw_lock_word) == LW_SHAPE_THIN) {
return LW_LOCK_OWNER(raw_lock_word);
} else {
@@ -891,7 +891,7 @@
os << " - waiting to lock ";
object = thread->monitor_enter_object_;
if (object != NULL) {
- lock_owner = object->GetLockOwner();
+ lock_owner = object->GetThinLockId();
}
} else {
// We're not waiting on anything.