Merge pull request #1965 from bjorng/bjorn/compiler/misc-cleanups

Minor cleanups and bug fixes of the compiler

1 files changed, 28 insertions, 15 deletions

diff --git a/lib/compiler/src/beam_ssa_pre_codegen.erl b/lib/compiler/src/beam_ssa_pre_codegen.erl
index 36137ef046..19a938c897 100644
--- a/lib/compiler/src/beam_ssa_pre_codegen.erl
+++ b/lib/compiler/src/beam_ssa_pre_codegen.erl
@@ -652,21 +652,24 @@ sanitize([], Count, Blocks0, Values) ->
          false -> remove_unreachable(Ls, Blocks, Reachable, [])
      end,Count}.
 
-sanitize_is([#b_set{op=get_map_element,
-                    args=[#b_literal{}=Map,Key]}=I0|Is],
-            Count0, Values, _Changed, Acc) ->
-    {MapVar,Count} = new_var('@ssa_map', Count0),
-    I = I0#b_set{args=[MapVar,Key]},
-    Copy = #b_set{op=copy,dst=MapVar,args=[Map]},
-    sanitize_is(Is, Count, Values, true, [I,Copy|Acc]);
+sanitize_is([#b_set{op=get_map_element,args=Args0}=I0|Is],
+            Count0, Values, Changed, Acc) ->
+    case sanitize_args(Args0, Values) of
+        [#b_literal{}=Map,Key] ->
+            %% Bind the literal map to a variable.
+            {MapVar,Count} = new_var('@ssa_map', Count0),
+            I = I0#b_set{args=[MapVar,Key]},
+            Copy = #b_set{op=copy,dst=MapVar,args=[Map]},
+            sanitize_is(Is, Count, Values, true, [I,Copy|Acc]);
+        [_,_]=Args0 ->
+            sanitize_is(Is, Count0, Values, Changed, [I0|Acc]);
+        [_,_]=Args ->
+            I = I0#b_set{args=Args},
+            sanitize_is(Is, Count0, Values, Changed, [I|Acc])
+    end;
 sanitize_is([#b_set{op=Op,dst=Dst,args=Args0}=I0|Is0],
-            Count, Values, Changed, Acc) ->
-    Args = map(fun(Var) ->
-                       case Values of
-                           #{Var:=New} -> New;
-                           #{} -> Var
-                       end
-               end, Args0),
+            Count, Values, Changed0, Acc) ->
+    Args = sanitize_args(Args0, Values),
     case sanitize_instr(Op, Args, I0) of
         {value,Value0} ->
             Value = #b_literal{val=Value0},
@@ -674,7 +677,9 @@ sanitize_is([#b_set{op=Op,dst=Dst,args=Args0}=I0|Is0],
         {ok,I} ->
             sanitize_is(Is0, Count, Values, true, [I|Acc]);
         ok ->
-            sanitize_is(Is0, Count, Values, Changed, [I0|Acc])
+            I = I0#b_set{args=Args},
+            Changed = Changed0 orelse Args =/= Args0,
+            sanitize_is(Is0, Count, Values, Changed, [I|Acc])
     end;
 sanitize_is([], Count, Values, Changed, Acc) ->
     case Changed of
@@ -684,6 +689,14 @@ sanitize_is([], Count, Values, Changed, Acc) ->
             no_change
     end.
 
+sanitize_args(Args, Values) ->
+    map(fun(Var) ->
+                case Values of
+                    #{Var:=New} -> New;
+                    #{} -> Var
+                end
+        end, Args).
+
 sanitize_instr({bif,Bif}, [#b_literal{val=Lit}], _I) ->
     case erl_bifs:is_pure(erlang, Bif, 1) of
         false ->