From 3c1c05a1e8eeff783f2854ee31bff8117ee274dd Mon Sep 17 00:00:00 2001
From: Roland Levillain <rpl@google.com>
Date: Sat, 25 Apr 2015 12:17:24 +0100
Subject: Disable Quick's GVN-based dead code elimination.

Quick's GVN/DCE seems to trouble the builds.

Bug: 20572509
Change-Id: I1e315b4eee4443f04c7cb2cef953d8e4eff619ce
---
 compiler/dex/quick/quick_compiler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/dex/quick/quick_compiler.cc')

diff --git a/compiler/dex/quick/quick_compiler.cc b/compiler/dex/quick/quick_compiler.cc
index 73cfe92c45..39eb117e9c 100644
--- a/compiler/dex/quick/quick_compiler.cc
+++ b/compiler/dex/quick/quick_compiler.cc
@@ -575,7 +575,7 @@ static uint32_t kCompilerOptimizerDisableFlags = 0 |  // Disable specific optimi
   // (1 << kNullCheckElimination) |
   // (1 << kClassInitCheckElimination) |
   // (1 << kGlobalValueNumbering) |
-  // (1 << kGvnDeadCodeElimination) |
+  (1 << kGvnDeadCodeElimination) |
   // (1 << kLocalValueNumbering) |
   // (1 << kPromoteRegs) |
   // (1 << kTrackLiveTemps) |
-- 
cgit v1.2.3-59-g8ed1b