commit 27df758e2e7baebb6e3f393f9732fd0d064420c8
author Calin Juravle <calin@google.com> Fri Apr 17 19:12:31 2015 +0100
committer Calin Juravle <calin@google.com> Mon Apr 20 14:02:51 2015 +0100
tree 261207281fd574deffb4dc1c1bc6bea8f150993e
parent f8bdd9f3a002970e4b8fdcf6fe6730116f1626c3

[optimizing] Add memory barriers in constructors when needed

If a class has final fields we must add a memory barrier before
returning from constructor. This makes sure the fields are visible to
other threads.

Bug: 19851497
Change-Id: If8c485092fc512efb9636cd568cb0543fb27688e

compiler/optimizing/dead_code_elimination.cc

diff --git a/compiler/optimizing/dead_code_elimination.cc b/compiler/optimizing/dead_code_elimination.cc
index fc3dd01..9499040 100644
--- a/compiler/optimizing/dead_code_elimination.cc
+++ b/compiler/optimizing/dead_code_elimination.cc
@@ -38,6 +38,7 @@
       if (!inst->HasSideEffects()
           && !inst->CanThrow()
           && !inst->IsSuspendCheck()
+          && !inst->IsMemoryBarrier()  // If we added an explicit barrier then we should keep it.
           && !inst->HasUses()) {
         block->RemoveInstruction(inst);
       }