commit c91df2d6339dd4adf2da582372451df19ce2ff44
author Vladimir Marko <vmarko@google.com> Thu Apr 23 09:29:21 2015 +0000
committer Vladimir Marko <vmarko@google.com> Thu Apr 23 11:11:33 2015 +0100
tree 1aed25cec12d9bf8dc2d07945ed45b8b230010df
parent 9d4d13f38398e880e610323242fe73d609bac40d

Revert "Revert "Quick: Rewrite type inference pass.""

Fix the type of the ArtMethod* SSA register.

Bug: 19419671
This reverts commit 1b717f63847de8762e7f7bdd6708fdfae9d24a67.

Change-Id: Ie4da3c03a0e0334a39a24718f6dc31f9255cfb53

compiler/dex/gvn_dead_code_elimination.h

diff --git a/compiler/dex/gvn_dead_code_elimination.h b/compiler/dex/gvn_dead_code_elimination.h
index 9a19f29..f2378f2 100644
--- a/compiler/dex/gvn_dead_code_elimination.h
+++ b/compiler/dex/gvn_dead_code_elimination.h
@@ -128,7 +128,7 @@
   void KillMIR(MIRData* data);
   static void KillMIR(MIR* mir);
   static void ChangeBinOp2AddrToPlainBinOp(MIR* mir);
-  MIR* CreatePhi(int s_reg, bool fp);
+  MIR* CreatePhi(int s_reg);
   MIR* RenameSRegDefOrCreatePhi(uint16_t def_change, uint16_t last_change, MIR* mir_to_kill);
 
   // Update state variables going backwards through a MIR.