hipe_rtl_binary:get_word_integer/4: Handle imms

Immediate arguments to get_word_integer/4 would lead to bad but
unreachable RTL being generated. We omit its generation by testing for
immediates and performing the logic at compile time.

1 files changed, 14 insertions, 4 deletions

diff --git a/lib/hipe/rtl/hipe_rtl_binary.erl b/lib/hipe/rtl/hipe_rtl_binary.erl
index fb9c0c196d..ad23df80d2 100644
--- a/lib/hipe/rtl/hipe_rtl_binary.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary.erl
@@ -106,10 +106,20 @@ create_lbls(0) ->
 %%------------------------------------------------------------------------------
 
 get_word_integer(Var, Register, SystemLimitLblName, FalseLblName) ->
-  [EndLbl] = create_lbls(1),
-  EndName = hipe_rtl:label_name(EndLbl),
-  get_word_integer(Var, Register,SystemLimitLblName,  FalseLblName, EndName, EndName,
-		   [EndLbl]).
+  case hipe_rtl:is_imm(Var) of
+    true ->
+      TaggedVal = hipe_rtl:imm_value(Var),
+      true = hipe_tagscheme:is_fixnum(TaggedVal),
+      Val = hipe_tagscheme:fixnum_val(TaggedVal),
+      if Val < 0 -> [hipe_rtl:mk_goto(FalseLblName)];
+	true -> [hipe_rtl:mk_move(Register, hipe_rtl:mk_imm(Val))]
+      end;
+    false ->
+      [EndLbl] = create_lbls(1),
+      EndName = hipe_rtl:label_name(EndLbl),
+      get_word_integer(Var, Register,SystemLimitLblName,  FalseLblName,
+		       EndName, EndName, [EndLbl])
+  end.
 
 get_word_integer(Var, Register, SystemLimitLblName, FalseLblName, TrueLblName,
 		 BigLblName, Tail) ->