Merge branch 'bjorn/compiler/clean-up-codegen'

* bjorn/compiler/clean-up-codegen:
  bs_match_SUITE: Cover more clauses in v3_codegen:bs_rename_ctx/4
  Clean up and comment code generation for basic blocks
  Stop trying to maximize the use of x(0)
  Clean up collection of basic blocks

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index e6fa80e143..39f9b5d063 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -40,7 +40,7 @@
 	 map_and_binary/1,unsafe_branch_caching/1,
 	 bad_literals/1,good_literals/1,constant_propagation/1,
 	 parse_xml/1,get_payload/1,escape/1,num_slots_different/1,
-         check_bitstring_list/1]).
+         check_bitstring_list/1,guard/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -73,7 +73,7 @@ groups() ->
        map_and_binary,unsafe_branch_caching,
        bad_literals,good_literals,constant_propagation,parse_xml,
        get_payload,escape,num_slots_different,
-       check_bitstring_list]}].
+       check_bitstring_list,guard]}].
 
 
 init_per_suite(Config) ->
@@ -1587,6 +1587,18 @@ check_bitstring_list(<<>>, []) ->
 check_bitstring_list(_, _) ->
     false.
 
+guard(_Config) ->
+    Tuple = id({a,b}),
+    ok = guard_1(<<1,2,3>>, {1,2,3}),
+
+    ok.
+
+%% Cover handling of #k_put{} in v3_codegen:bsm_rename_ctx/4.
+
+guard_1(<<A,B,C>>, Tuple) when Tuple =:= {A,B,C} ->
+    ok.
+
+
 check(F, R) ->
     R = F().