From 47f61b16efe9f4304a522f54a4b630a6ffc08b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 12 Dec 2017 14:48:50 +0100
Subject: beam_util: Fix bug in is_not_used/3

01835845579e9 fixed some problems, but introduced a bug where
is_not_used/3 would report that a register was not used when it
in fact was.
---
 lib/compiler/src/beam_utils.erl        |  9 +++++++--
 lib/compiler/test/beam_utils_SUITE.erl | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'lib/compiler')

diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index 1b2a2827cb..bd1423cb40 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -318,6 +318,10 @@ check_liveness(R, [{block,Blk}|Is], St0) ->
     case check_liveness_block(R, Blk, St0) of
 	{transparent,St1} ->
 	    check_liveness(R, Is, St1);
+	{alloc_used,St1} ->
+            %% Used by an allocating instruction, but value not referenced.
+            %% Must check the rest of the instructions.
+	    not_used(check_liveness(R, Is, St1));
 	{Other,_}=Res when is_atom(Other) ->
 	    Res
     end;
@@ -588,7 +592,7 @@ check_liveness_ret(R, R, St) -> {used,St};
 check_liveness_ret(_, _, St) -> {killed,St}.
 
 %% check_liveness_block(Reg, [Instruction], State) ->
-%%     {killed | not_used | used | transparent,State'}
+%%     {killed | not_used | used | alloc_used | transparent,State'}
 %%  Finds out how Reg is used in the instruction sequence inside a block.
 %%  Returns one of:
 %%    killed - Reg is assigned a new value or killed by an
@@ -596,6 +600,7 @@ check_liveness_ret(_, _, St) -> {killed,St}.
 %%    not_used - The value is not used, but the register is referenced
 %%       e.g. by an allocation instruction
 %%    transparent - Reg is neither used nor killed
+%%    alloc_used - Used only in an allocate instruction
 %%    used - Reg is explicitly used by an instruction
 %%
 %%  '%live' annotations are not allowed.
@@ -609,7 +614,7 @@ check_liveness_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], St0) ->
 	true ->
 	    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
 		{killed,St} -> {not_used,St};
-		{transparent,St} -> {not_used,St};
+                {transparent,St} -> {alloc_used,St};
 		{_,_}=Res -> Res
 	    end
     end;
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index 3a07f3923f..d516b0c3c7 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -25,7 +25,7 @@
 	 is_not_killed/1,is_not_used_at/1,
 	 select/1,y_catch/1,otp_8949_b/1,liveopt/1,coverage/1,
          y_registers/1,user_predef/1,scan_f/1,cafu/1,
-         receive_label/1]).
+         receive_label/1,read_size_file_version/1]).
 -export([id/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -50,7 +50,8 @@ groups() ->
        y_registers,
        user_predef,
        scan_f,
-       cafu
+       cafu,
+       read_size_file_version
       ]}].
 
 init_per_suite(Config) ->
@@ -445,5 +446,18 @@ do_receive_label(Rec) ->
             do_receive_label(Rec)
     end.
 
+read_size_file_version(_Config) ->
+    ok = do_read_size_file_version({ok,<<42>>}),
+    {ok,7777} = do_read_size_file_version({ok,<<7777:32>>}),
+    ok.
+
+do_read_size_file_version(E) ->
+    case E of
+	{ok,<<Version>>} when Version =:= 42 ->
+            ok;
+	{ok,<<MaxFiles:32>>} ->
+            {ok,MaxFiles}
+    end.
+
 %% The identity function.
 id(I) -> I.
-- 
cgit v1.2.3