summaryrefslogtreecommitdiff
path: root/runtime/mirror/class.h
diff options
context:
space:
mode:
author Ian Rogers <irogers@google.com> 2014-06-03 00:04:17 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-06-03 00:04:17 +0000
commit0f821c00aeca7b6fca789e5613a91aef786b45af (patch)
tree6d8690b32e48239a0a11127f8c5b42cf0591a554 /runtime/mirror/class.h
parent7a33c4b8260e2fafc9ca94e51334d4f18c8e4324 (diff)
parent03dbc04d1d5a3bd62801989b16e994a9ed0dafb5 (diff)
Merge "Make class status volatile."
Diffstat (limited to 'runtime/mirror/class.h')
-rw-r--r--runtime/mirror/class.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 40c9975cdd..90381a7dec 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -125,7 +125,8 @@ class MANAGED Class : public Object {
template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
Status GetStatus() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
COMPILE_ASSERT(sizeof(Status) == sizeof(uint32_t), size_of_status_not_uint32);
- return static_cast<Status>(GetField32<kVerifyFlags>(OFFSET_OF_OBJECT_MEMBER(Class, status_)));
+ return static_cast<Status>(
+ GetField32Volatile<kVerifyFlags>(OFFSET_OF_OBJECT_MEMBER(Class, status_)));
}
void SetStatus(Status new_status, Thread* self) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);