Merge "Fix codegen_test after DCE fix."

1 files changed, 4 insertions, 1 deletions

diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index ca85cf5fae..4fbb51d43c 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -192,7 +192,10 @@ static void RunCodeOptimized(CodeGenerator* codegen,
                              std::function<void(HGraph*)> hook_before_codegen,
                              bool has_result,
                              Expected expected) {
-  graph->BuildDominatorTree();
+  // Tests may have already computed it.
+  if (graph->GetReversePostOrder().IsEmpty()) {
+    graph->BuildDominatorTree();
+  }
   SsaLivenessAnalysis liveness(graph, codegen);
   liveness.Analyze();