diff options
| author | Ian Rogers <irogers@google.com> | 2013-11-19 18:00:50 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-12-20 08:01:57 -0800 |
| commit | b122a4bbed34ab22b4c1541ee25e5cf22f12a926 (patch) | |
| tree | 624f16271f4481a8fd5aa2f607385f490dc7b3ae /runtime/interpreter/interpreter_goto_table_impl.cc | |
| parent | e40687d053b89c495b6fbeb7a766b01c9c7e039c (diff) | |
| download | art-b122a4bbed34ab22b4c1541ee25e5cf22f12a926.zip art-b122a4bbed34ab22b4c1541ee25e5cf22f12a926.tar.gz art-b122a4bbed34ab22b4c1541ee25e5cf22f12a926.tar.bz2 | |
Tidy up memory barriers.
Change-Id: I937ea93e6df1835ecfe2d4bb7d84c24fe7fc097b
Diffstat (limited to 'runtime/interpreter/interpreter_goto_table_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index 99c85bd..942c275 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -245,7 +245,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* // If access checks are required then the dex-to-dex compiler and analysis of // whether the class has final fields hasn't been performed. Conservatively // perform the memory barrier now. - ANDROID_MEMBAR_STORE(); + QuasiAtomic::MembarStoreLoad(); } if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -261,7 +261,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(RETURN_VOID_BARRIER) { - ANDROID_MEMBAR_STORE(); + QuasiAtomic::MembarStoreLoad(); JValue result; if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); |