commit fffdb023275613612a22ec62b3421ffe4d2b73fe
author Ian Rogers <irogers@google.com> Fri Jan 04 15:14:08 2013 -0800
committer Ian Rogers <irogers@google.com> Fri Jan 04 15:31:42 2013 -0800
tree eb24cffd6ad7a50a11e9b3c3bcad3688865192e7
parent c8253caa7045a7683666725a6d8aeba96a8f9c7a

Add memory barrier for final instance fields.

Change-Id: I1a02f0f75e974f4c84d61254da05480c20ff881c

src/compiler/codegen/mir_to_lir.cc

diff --git a/src/compiler/codegen/mir_to_lir.cc b/src/compiler/codegen/mir_to_lir.cc
index acdeafe..1d64661 100644
--- a/src/compiler/codegen/mir_to_lir.cc
+++ b/src/compiler/codegen/mir_to_lir.cc
@@ -86,6 +86,11 @@
       cg->GenMoveException(cu, rl_dest);
       break;
     case Instruction::RETURN_VOID:
+      if (((cu->access_flags & kAccConstructor) != 0) &&
+          cu->compiler->RequiresConstructorBarrier(Thread::Current(), cu->dex_file,
+                                                   cu->class_def_idx)) {
+        cg->GenMemBarrier(cu, kStoreStore);
+      }
       if (!(cu->attrs & METHOD_IS_LEAF)) {
         cg->GenSuspendTest(cu, opt_flags);
       }