commit a65ed3045ec2df95a30994752b3fb0576f479354
author Vladimir Marko <vmarko@google.com> Mon Mar 14 21:21:29 2016 +0000
committer Vladimir Marko <vmarko@google.com> Mon Mar 14 21:22:49 2016 +0000
tree c566a5bcfdf9ad9717f82aea809c88a253cb6960
parent 11ad2523557c35acfbf829aa203d14914e61884e

Optimizing: Fix valgrind error in image_test64.

Bug: 27651442
Change-Id: Id9b80c6015dbc3b82966766ca4ad010be770f116

compiler/optimizing/instruction_simplifier.cc

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 69dad69..8daa46c 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -469,7 +469,9 @@
     return;
   }
 
-  bool outcome;
+  // Note: The `outcome` is initialized to please valgrind - the compiler can reorder
+  // the return value check with the `outcome` check, b/27651442 .
+  bool outcome = false;
   if (TypeCheckHasKnownOutcome(load_class, object, &outcome)) {
     if (outcome) {
       check_cast->GetBlock()->RemoveInstruction(check_cast);