commit ad2541a59c00c2c69e8973088891a2b5257c9780
author Mathieu Chartier <mathieuc@google.com> Fri Oct 25 10:05:23 2013 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Oct 29 12:14:36 2013 -0700
tree 523898cf039c5185352978e71a54fa3a2657a04c
parent 9780099e445884d8bc9444c8c1261b02d80a26c7

Fix object identity hash.

The object identity hash is now stored in the monitor word after
being computed. Hashes are computed by a pseudo random number
generator.

When we write the image, we eagerly compute object hashes to
prevent pages getting dirtied.

Bug: 8981901

Change-Id: Ic8edacbacb0afc7055fd740a52444929f88ed564

runtime/mirror/object-inl.h

diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h
index e460a8d..7ac2c8c 100644
--- a/runtime/mirror/object-inl.h
+++ b/runtime/mirror/object-inl.h
@@ -44,7 +44,7 @@
   SetFieldPtr(OFFSET_OF_OBJECT_MEMBER(Object, klass_), new_klass, false, false);
 }
 
-inline LockWord Object::GetLockWord() {
+inline LockWord Object::GetLockWord() const {
   return LockWord(GetField32(OFFSET_OF_OBJECT_MEMBER(Object, monitor_), true));
 }