Merge pull request #1837 from kostis/hipe-lcm-21-fix

Fix a crash in HiPE's lazy code motion pass

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index af39c9a0a4..2c8cc80e56 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -267,14 +267,17 @@ try_insert_expr_last(CFG0, Label, Instr) ->
 %% with the new code inserted second to last (assuming the last expression
 %% is a branch operation).
 insert_expr_last_work(_Instr, [#call{}]) ->
-  %% Call instructions clobber all expressions; we musn't insert the expression
-  %% before it
+  %% Call instructions clobber all expressions; we must not insert the
+  %% expression before it
   not_safe;
 insert_expr_last_work(Instr, [Code1]) ->
   %% We insert the code next to last.
   [Instr, Code1];
 insert_expr_last_work(Instr, [Code|Codes]) ->
-  [Code|insert_expr_last_work(Instr, Codes)].
+  case insert_expr_last_work(Instr, Codes) of
+    not_safe -> not_safe;
+    NewCodes -> [Code|NewCodes]
+  end.
 
 %%=============================================================================
 %% Inserts expression first in the block for the given label.