diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-10 02:07:54 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-07-10 02:07:54 -0700 |
| commit | 228602f562f1d130d06e60a98752d99c2d467d6a (patch) | |
| tree | ee5b543695843ce48ebec4ffc88514ff679f4e93 /runtime/interpreter | |
| parent | be2a1df15a31a5223ee9af3015a00c31d2ad2e10 (diff) | |
| download | art-228602f562f1d130d06e60a98752d99c2d467d6a.zip art-228602f562f1d130d06e60a98752d99c2d467d6a.tar.gz art-228602f562f1d130d06e60a98752d99c2d467d6a.tar.bz2 | |
Make CAS operations in Object use art::Atomic.
Make naming consistent with art::Atomic.
Change-Id: If3abdb019ef8b53bd809e3fef3fd5248aeb27e9a
Diffstat (limited to 'runtime/interpreter')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index cb4d444..729444e 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -95,9 +95,11 @@ static void UnstartedRuntimeJni(Thread* self, ArtMethod* method, jint newValue = args[4]; bool success; if (Runtime::Current()->IsActiveTransaction()) { - success = obj->CasField32<true>(MemberOffset(offset), expectedValue, newValue); + success = obj->CasFieldWeakSequentiallyConsistent32<true>(MemberOffset(offset), + expectedValue, newValue); } else { - success = obj->CasField32<false>(MemberOffset(offset), expectedValue, newValue); + success = obj->CasFieldWeakSequentiallyConsistent32<false>(MemberOffset(offset), + expectedValue, newValue); } result->SetZ(success ? JNI_TRUE : JNI_FALSE); } else if (name == "void sun.misc.Unsafe.putObject(java.lang.Object, long, java.lang.Object)") { |