Enable annotalysis on clang ART builds.
Fix clang build errors aswell as restructure locking/mutex code for correct
thread safety analysis support.
Reorder make dependencies so that host builds build first as they should
provide better compilation errors than target.
Remove host's use of -fno-omit-frame-pointer as it has no value with correct
use of CFI, which we should have.
Change-Id: I72cea8da9a3757b1a0b3acb4081feccb7c6cef90
diff --git a/runtime/monitor.cc b/runtime/monitor.cc
index 64794fe..332aef0 100644
--- a/runtime/monitor.cc
+++ b/runtime/monitor.cc
@@ -650,9 +650,22 @@
}
}
+// Fool annotalysis into thinking that the lock on obj is acquired.
+static mirror::Object* FakeLock(mirror::Object* obj)
+ EXCLUSIVE_LOCK_FUNCTION(obj) NO_THREAD_SAFETY_ANALYSIS {
+ return obj;
+}
+
+// Fool annotalysis into thinking that the lock on obj is release.
+static mirror::Object* FakeUnlock(mirror::Object* obj)
+ UNLOCK_FUNCTION(obj) NO_THREAD_SAFETY_ANALYSIS {
+ return obj;
+}
+
mirror::Object* Monitor::MonitorEnter(Thread* self, mirror::Object* obj) {
DCHECK(self != NULL);
DCHECK(obj != NULL);
+ obj = FakeLock(obj);
uint32_t thread_id = self->GetThreadId();
size_t contention_count = 0;
SirtRef<mirror::Object> sirt_obj(self, obj);
@@ -698,24 +711,22 @@
mon->Lock(self);
return sirt_obj.get(); // Success!
}
- case LockWord::kHashCode: {
+ case LockWord::kHashCode:
// Inflate with the existing hashcode.
Inflate(self, nullptr, sirt_obj.get(), lock_word.GetHashCode());
- break;
- }
+ continue; // Start from the beginning.
default: {
LOG(FATAL) << "Invalid monitor state " << lock_word.GetState();
return sirt_obj.get();
}
}
}
- return sirt_obj.get();
}
bool Monitor::MonitorExit(Thread* self, mirror::Object* obj) {
DCHECK(self != NULL);
DCHECK(obj != NULL);
-
+ obj = FakeUnlock(obj);
LockWord lock_word = obj->GetLockWord();
SirtRef<mirror::Object> sirt_obj(self, obj);
switch (lock_word.GetState()) {