From b122a4bbed34ab22b4c1541ee25e5cf22f12a926 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 19 Nov 2013 18:00:50 -0800 Subject: Tidy up memory barriers. Change-Id: I937ea93e6df1835ecfe2d4bb7d84c24fe7fc097b --- runtime/interpreter/interpreter_switch_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/interpreter/interpreter_switch_impl.cc') diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 675095f..75041ea 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -169,7 +169,7 @@ JValue ExecuteSwitchImpl(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); @@ -183,7 +183,7 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem } case Instruction::RETURN_VOID_BARRIER: { PREAMBLE(); - ANDROID_MEMBAR_STORE(); + QuasiAtomic::MembarStoreLoad(); JValue result; if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); -- cgit v1.1