Merge branch 'bjorn/compiler/fix-beam_utils/ERL-650/OTP-15150' into maint-21

* bjorn/compiler/fix-beam_utils/ERL-650/OTP-15150:
  Fix unsafe optimization when running beam_block the second time

2 files changed, 29 insertions, 2 deletions

diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index 5510624b2d..ff587c4982 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -1105,8 +1105,12 @@ defs([{bif,_,{f,Fail},_Src,Dst}=I|Is], Regs0, D) ->
 defs([{block,Block0}|Is], Regs0, D0) ->
     {Block,Regs,D} = defs_list(Block0, Regs0, D0),
     [{block,[make_anno({def,Regs0})|Block]}|defs(Is, Regs, D)];
-defs([{bs_init,{f,L},_,_,_,Dst}=I|Is], Regs0, D) ->
-    Regs = def_regs([Dst], Regs0),
+defs([{bs_init,{f,L},_,Live,_,Dst}=I|Is], Regs0, D) ->
+    Regs1 = case Live of
+                none -> Regs0;
+                _ -> init_def_regs(Live)
+            end,
+    Regs = def_regs([Dst], Regs1),
     [I|defs(Is, Regs, update_regs(L, Regs, D))];
 defs([{bs_put,{f,L},_,_}=I|Is], Regs, D) ->
     [I|defs(Is, Regs, update_regs(L, Regs, D))];
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index 3d35b546fc..360dcc1e84 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -132,6 +132,15 @@ bs_init(_Config) ->
     <<"foo/foo">> = do_bs_init_4(<<"foo">>, true),
     error = do_bs_init_4([], not_boolean),
 
+    Id = 17575,
+    Domain = -8798798,
+    [<<10,1:16,Id:16/signed>>,<<8,2:16,Domain:32/signed>>] =
+        do_bs_init_5(#{tag=>value,id=>Id,domain=>Domain}),
+    {'EXIT',{{required,id},[_|_]}} =
+        (catch do_bs_init_5(#{tag=>value,id=>nil,domain=>Domain})),
+    {'EXIT',{{required,domain},[_|_]}} =
+        (catch do_bs_init_5(#{tag=>value,id=>Id,domain=>nil})),
+
     ok.
 
 do_bs_init_1([?MODULE], Sz) ->
@@ -189,6 +198,20 @@ do_bs_init_4(Arg1, Arg2) ->
             error
     end.
 
+do_bs_init_5(#{tag := value, id := Id, domain := Domain}) ->
+    [case Id of
+         nil ->
+             error(id({required, id}));
+         _ ->
+             <<10, 1:16/signed, Id:16/signed>>
+     end,
+     case Domain of
+         nil ->
+             error(id({required, domain}));
+         _ ->
+             <<8, 2:16/signed, Domain:32/signed>>
+     end].
+
 bs_save(_Config) ->
     {a,30,<<>>} = do_bs_save(<<1:1,30:5>>),
     {b,127,<<>>} = do_bs_save(<<1:1,31:5,0:1,127:7>>),