Merge "Clean up art::HConstant predicates."

diff --cc compiler/optimizing/code_generator_arm.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm64.h
index a1f686e,0af825b..cf9dc1b
--- 1/compiler/optimizing/code_generator_arm64.h
--- 2/compiler/optimizing/code_generator_arm64.h
+++ b/compiler/optimizing/code_generator_arm64.h
@@@ -257,7 -257,12 +257,10 @@@ class InstructionCodeGeneratorARM64 : p
                                 vixl::Register obj,
                                 uint32_t offset);
  
+   // Generate a floating-point comparison.
+   void GenerateFcmp(HInstruction* instruction);
+ 
    void HandleShift(HBinaryOperation* instr);
 -  void GenerateImplicitNullCheck(HNullCheck* instruction);
 -  void GenerateExplicitNullCheck(HNullCheck* instruction);
    void GenerateTestAndBranch(HInstruction* instruction,
                               size_t condition_input_index,
                               vixl::Label* true_target,

diff --cc compiler/optimizing/code_generator_mips.cc
Simple merge

diff --cc compiler/optimizing/code_generator_mips64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.cc
Simple merge

diff --cc compiler/optimizing/dead_code_elimination.cc
Simple merge

diff --cc compiler/optimizing/inliner.cc
Simple merge

diff --cc compiler/optimizing/instruction_simplifier.cc
Simple merge

diff --cc compiler/optimizing/nodes.cc
Simple merge

diff --cc compiler/optimizing/nodes.h
Simple merge