diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-02-14 16:59:41 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-02-14 18:26:37 -0800 |
| commit | e7e8a5fea2d852cccc840fa046151a16627f26cd (patch) | |
| tree | 4509736090c371a363e79f4a3d01107d0b8d5e72 /runtime/monitor.h | |
| parent | cc35e45f371f5018b42e2ef383185e2840cf4374 (diff) | |
| download | art-e7e8a5fea2d852cccc840fa046151a16627f26cd.zip art-e7e8a5fea2d852cccc840fa046151a16627f26cd.tar.gz art-e7e8a5fea2d852cccc840fa046151a16627f26cd.tar.bz2 | |
Remove using mirror::* in jni internal.
Cleans up the code since it helps make it easier to spot moving GC
related bugs.
Also fixed moving GC bugs in MonitorEnter, and FindFieldID.
Change-Id: I794e4fbcc2010875fc6b299c6d4c9fb0f071b71a
Diffstat (limited to 'runtime/monitor.h')
| -rw-r--r-- | runtime/monitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index ca95e0b..d0a3a2e 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -57,7 +57,7 @@ class Monitor { static uint32_t GetLockOwnerThreadId(mirror::Object* obj) NO_THREAD_SAFETY_ANALYSIS; // TODO: Reading lock owner without holding lock is racy. - static void MonitorEnter(Thread* thread, mirror::Object* obj) + static mirror::Object* MonitorEnter(Thread* thread, mirror::Object* obj) EXCLUSIVE_LOCK_FUNCTION(monitor_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); static bool MonitorExit(Thread* thread, mirror::Object* obj) |