Merge branch 'margnus1/hipe/refactor-rtl/PR-1243'

* margnus1/hipe/refactor-rtl/PR-1243:
  hipe_x86: Fix encoding of test instr w/ neg imm
  hipe_tagscheme: Simplify test_two_fixnums with imm
  hipe_icode: Always const-propagate if&call args
  hipe_tagscheme: x86 lea+test for mask_and_compare
  hipe_tagscheme: Improve fixnum_addsub with imm
  hipe: Make realloc_binary fast case true branch
  hipe_x86_postpass: Negate conditions in goto elim
  hipe_tagscheme: Improve fixnum add on x86
  hipe_rtl_to_x86: Use LEA only for immediate adds
  hipe_x86: LeaToAdd peephole rule
  hipe_sparc: move coalescing
  hipe_ppc: better rlwinm pp
  hipe_ppc: move coalescing
  hipe_rtl: drop alub dest when unused
  hipe_rtl: unify branch and alub
  hipe_x86: Fix&activate ElimCmp0 peephole rule
  hipe_{x86,amd64}: Finish test instr implementation

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/hipe/x86/hipe_x86_ra_finalise.erl b/lib/hipe/x86/hipe_x86_ra_finalise.erl
index edfd7b332c..1fd617570a 100644
--- a/lib/hipe/x86/hipe_x86_ra_finalise.erl
+++ b/lib/hipe/x86/hipe_x86_ra_finalise.erl
@@ -162,6 +162,10 @@ ra_insn(I, Map, FpMap) ->
       Src = ra_opnd(Src0, Map),
       Dst = ra_opnd(Dst0, Map),
       I#shift{src=Src,dst=Dst};
+    #test{src=Src0,dst=Dst0} ->
+      Src = ra_opnd(Src0, Map),
+      Dst = ra_opnd(Dst0, Map),
+      I#test{src=Src,dst=Dst};
     _ ->
       exit({?MODULE,ra_insn,I})
   end.