commit 1749e2cfb5c5ed4d6970a09aecf898ca9cdfcb75
author David Brazdil <dbrazdil@google.com> Mon Sep 28 13:49:59 2015 +0100
committer David Brazdil <dbrazdil@google.com> Wed Nov 04 18:13:45 2015 +0000
tree 57ab54c48a7404abf0c9f2c919e8a6c805d98587
parent c8894ab5021aecd0fa5eba94af47f732914af33b

ART: Implement DeadPhiHandling in PrimitiveTypePropagation

DeadPhiHandling revives non-conflicting phis with environment uses
but does not properly merge types. To not duplicate code, this patch
modifies PrimitiveTypePropagation to deal with conflicts and thus
replaces DeadPhiHandling altogether.

Bug: 24252151
Bug: 24252100

Change-Id: I198c71d1b8167fc05783a5a24aa9f1e3804acafe

compiler/optimizing/ssa_builder.h

diff --git a/compiler/optimizing/ssa_builder.h b/compiler/optimizing/ssa_builder.h
index 79f1a28..da0583c 100644
--- a/compiler/optimizing/ssa_builder.h
+++ b/compiler/optimizing/ssa_builder.h
@@ -81,6 +81,8 @@
   static constexpr const char* kSsaBuilderPassName = "ssa_builder";
 
  private:
+  void SetLoopPhiInputs();
+  void FixEnvironmentPhis();
   void FixNullConstantType();
   void EquivalentPhisCleanup();