Merge "Call strong CAS from unsafe. Add more CAS versions."

diff --cc runtime/mirror/object-inl.h
Simple merge

diff --cc runtime/mirror/object.h
index 11998cc,bf952f2..4fae470
--- 1/runtime/mirror/object.h
--- 2/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@@ -265,12 -255,24 +266,24 @@@ class MANAGED LOCKABLE Object 
  
    template<bool kTransactionActive, bool kCheckTransaction = true,
        VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
 -  bool CasFieldWeakSequentiallyConsistent32(MemberOffset field_offset, int32_t old_value,
 -                                            int32_t new_value) ALWAYS_INLINE
 +  ALWAYS_INLINE bool CasFieldWeakSequentiallyConsistent32(MemberOffset field_offset,
 +                                                          int32_t old_value, int32_t new_value)
        SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
  
+   template<bool kTransactionActive, bool kCheckTransaction = true,
+       VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
+   bool CasFieldWeakRelaxed32(MemberOffset field_offset, int32_t old_value,
+                              int32_t new_value) ALWAYS_INLINE
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ 
+   template<bool kTransactionActive, bool kCheckTransaction = true,
+       VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
+   bool CasFieldStrongSequentiallyConsistent32(MemberOffset field_offset, int32_t old_value,
+                                               int32_t new_value) ALWAYS_INLINE
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ 
    template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, bool kIsVolatile = false>
 -  int64_t GetField64(MemberOffset field_offset) ALWAYS_INLINE
 +  ALWAYS_INLINE int64_t GetField64(MemberOffset field_offset)
        SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
  
    template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>