From 719d1a33f6569864f529e5a3fff59e7bca97aad0 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 Mar 2014 12:13:39 -0800 Subject: 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 --- runtime/jdwp/jdwp.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'runtime/jdwp') diff --git a/runtime/jdwp/jdwp.h b/runtime/jdwp/jdwp.h index fdbdfeb..fec0e31 100644 --- a/runtime/jdwp/jdwp.h +++ b/runtime/jdwp/jdwp.h @@ -31,11 +31,13 @@ struct iovec; namespace art { - union JValue; + +union JValue; +class Thread; + namespace mirror { class ArtMethod; } // namespace mirror -class Thread; namespace JDWP { @@ -156,7 +158,7 @@ struct JdwpState { // ObjectId GetWaitForEventThread(); void SetWaitForEventThread(ObjectId threadId) LOCKS_EXCLUDED(event_thread_lock_, process_request_lock_); - void ClearWaitForEventThread() LOCKS_EXCLUDED(event_thread_lock); + void ClearWaitForEventThread() LOCKS_EXCLUDED(event_thread_lock_); /* * These notify the debug code that something interesting has happened. This @@ -334,6 +336,7 @@ struct JdwpState { // Linked list of events requested by the debugger (breakpoints, class prep, etc). Mutex event_list_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; + JdwpEvent* event_list_ GUARDED_BY(event_list_lock_); size_t event_list_size_ GUARDED_BY(event_list_lock_); // Number of elements in event_list_. size_t full_deoptimization_requests_ GUARDED_BY(event_list_lock_); // Number of events requiring -- cgit v1.1