From 9e07ede3f954bdfc6af9f82c1b8261e38b8d857c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 17 Mar 2015 10:20:52 +0100
Subject: PER, UPER: Eliminate compiler warning for SeqPrim.asn1

The BEAM compiler now warns more aggressively for expressions whose
values are not used. For example, the generated Erlang code for
the following ASN.1 code will now cause a warning:

  Seq ::= SEQUENCE {
    ...,
    os OCTET STRING (SIZE (17000..30000))
  }

The generated Erlang code looks similar to the following:

  Enc9@bin = iolist_to_binary(Enc9@output),
  Enc9@len = byte_size(Enc9@bin),
  [align|encode_fragmented(Enc9@bin, 8)]

The variable Enc9@len is not used and the BEAM compiler will
complain that the value returned from the byte_size/1 call is
not used.

Improve the optimization of the intermediate code to eliminate
the assignment to the unused variable.
---
 lib/asn1/src/asn1ct_imm.erl | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'lib/asn1/src/asn1ct_imm.erl')

diff --git a/lib/asn1/src/asn1ct_imm.erl b/lib/asn1/src/asn1ct_imm.erl
index 91820e08de..5bf69e9294 100644
--- a/lib/asn1/src/asn1ct_imm.erl
+++ b/lib/asn1/src/asn1ct_imm.erl
@@ -1922,16 +1922,7 @@ enc_opt(nil, St) ->
 enc_opt({seq,H0,T0}, St0) ->
     {H,St1} = enc_opt(H0, St0),
     {T,St} = enc_opt(T0, St1),
-    case {H,T} of
-	{none,_} ->
-	    {T,St};
-	{{list,Imm,Data},
-	 {seq,{call,per,complete,[Data],_},_}} ->
-	    %% Get rid of any explicit 'align' added by per_enc_open_type/2.
-	    {{seq,{list,remove_trailing_align(Imm),Data},T},St};
-	{_,_} ->
-	    {{seq,H,T},St}
-    end;
+    {enc_opt_seq(H, T),St};
 enc_opt({set,_,_}=Imm, St) ->
     {Imm,St#ost{t=undefined}};
 enc_opt({sub,Src0,Int,Dst}, St0) ->
@@ -1965,6 +1956,28 @@ remove_trailing_align({seq,H,T}) ->
     {seq,H,remove_trailing_align(T)};
 remove_trailing_align(Imm) -> Imm.
 
+enc_opt_seq(none, T) ->
+    T;
+enc_opt_seq({list,Imm,Data}, {seq,{call,per,complete,[Data],_},_}=T) ->
+    %% Get rid of any explicit 'align' added by per_enc_open_type/2.
+    {seq,{list,remove_trailing_align(Imm),Data},T};
+enc_opt_seq({call,_,_,_,{var,_}=Dst}=H, T) ->
+    case is_var_unused(Dst, T) of
+	false -> {seq,H,T};
+	true -> T
+    end;
+enc_opt_seq(H, T) ->
+    {seq,H,T}.
+
+is_var_unused(_, align) ->
+    true;
+is_var_unused(V, {call,_,_,Args}) ->
+    not lists:member(V, Args);
+is_var_unused(V, {cons,H,T}) ->
+    is_var_unused(V, H) andalso is_var_unused(V, T);
+is_var_unused(_, _) ->
+    false.
+
 bit_size_propagate(Bin, Type, St) ->
     case t_range(Type) of
 	any ->
-- 
cgit v1.2.3