OSDN Git Service

ART: Implement DeadPhiHandling in PrimitiveTypePropagation
authorDavid Brazdil <dbrazdil@google.com>
Mon, 28 Sep 2015 12:49:59 +0000 (13:49 +0100)
committerDavid Brazdil <dbrazdil@google.com>
Wed, 4 Nov 2015 18:13:45 +0000 (18:13 +0000)
commit1749e2cfb5c5ed4d6970a09aecf898ca9cdfcb75
tree57ab54c48a7404abf0c9f2c919e8a6c805d98587
parentc8894ab5021aecd0fa5eba94af47f732914af33b
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
12 files changed:
compiler/optimizing/nodes.h
compiler/optimizing/primitive_type_propagation.cc
compiler/optimizing/primitive_type_propagation.h
compiler/optimizing/ssa_builder.cc
compiler/optimizing/ssa_builder.h
compiler/optimizing/ssa_phi_elimination.cc
test/538-checker-typeprop-debuggable/expected.txt [new file with mode: 0644]
test/538-checker-typeprop-debuggable/info.txt [new file with mode: 0644]
test/538-checker-typeprop-debuggable/smali/ArrayGet.smali [new file with mode: 0644]
test/538-checker-typeprop-debuggable/smali/SsaBuilder.smali [new file with mode: 0644]
test/538-checker-typeprop-debuggable/smali/TypePropagation.smali [new file with mode: 0644]
test/538-checker-typeprop-debuggable/src/Main.java [new file with mode: 0644]