diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 12:13:39 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-06 19:16:01 -0800 |
| commit | 719d1a33f6569864f529e5a3fff59e7bca97aad0 (patch) | |
| tree | fcd84efd7b9806b93ec1a44e2317e6f882e7fe0e /runtime/jni_internal.cc | |
| parent | 5365eea9940269b662cfbe103caa348816ff1558 (diff) | |
| download | art-719d1a33f6569864f529e5a3fff59e7bca97aad0.tar.gz art-719d1a33f6569864f529e5a3fff59e7bca97aad0.tar.bz2 art-719d1a33f6569864f529e5a3fff59e7bca97aad0.zip | |
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
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 1bcb8dd3bc..4fad5c9c11 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -2466,8 +2466,7 @@ class JNI { return JNI_OK; } - static jint MonitorEnter(JNIEnv* env, jobject java_object) - EXCLUSIVE_LOCK_FUNCTION(monitor_lock_) { + static jint MonitorEnter(JNIEnv* env, jobject java_object) NO_THREAD_SAFETY_ANALYSIS { CHECK_NON_NULL_ARGUMENT(MonitorEnter, java_object); ScopedObjectAccess soa(env); mirror::Object* o = soa.Decode<mirror::Object*>(java_object); @@ -2479,8 +2478,7 @@ class JNI { return JNI_OK; } - static jint MonitorExit(JNIEnv* env, jobject java_object) - UNLOCK_FUNCTION(monitor_lock_) { + static jint MonitorExit(JNIEnv* env, jobject java_object) NO_THREAD_SAFETY_ANALYSIS { CHECK_NON_NULL_ARGUMENT(MonitorExit, java_object); ScopedObjectAccess soa(env); mirror::Object* o = soa.Decode<mirror::Object*>(java_object); |