Merge branch 'bjorn/compiler/misc'

* bjorn/compiler/misc:
  test_lib: Simplify uniq/0
  beam_dict: Correct comparison in opcode/2
  beam_utils: Re-use the local helper function drop_labels/1
  beam_asm: Speed up encoding of large numbers
  compilation_SUITE: Speed up the self_compile test cases
  beam_listing: Optimize writing of .S files
  v3_core, v3_codegen: Eliminate old-style catches
  cerl_inline: Replace old-style 'catch' with 'try'...'catch'
  sys_core_fold: Suppress warnings better
  beam_utils: Teach check_liveness/3 to understand get_map_elements
  Teach beam_trim to handle map instructions
  beam_utils: Be less conservative about liveness for exit instructions
  beam_validator: Stop validating the 'aligned' flag for binaries
  beam_validator: Clean up updating of types for y register
  beam_validator: Remove support for removed BIF fault/1,2
  beam_validator: Correct merging of states
  beam_validator: Correct merging of y registers
  sys_pre_expand: Remove unused fields in #expand{} record

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/compiler/src/beam_trim.erl b/lib/compiler/src/beam_trim.erl
index fad9c42584..8181e555a1 100644
--- a/lib/compiler/src/beam_trim.erl
+++ b/lib/compiler/src/beam_trim.erl
@@ -172,6 +172,10 @@ remap([{bif,Name,Fail,Ss,D}|Is], Map, Acc) ->
 remap([{gc_bif,Name,Fail,Live,Ss,D}|Is], Map, Acc) ->
     I = {gc_bif,Name,Fail,Live,[Map(S) || S <- Ss],Map(D)},
     remap(Is, Map, [I|Acc]);
+remap([{get_map_elements,Fail,M,{list,L0}}|Is], Map, Acc) ->
+    L = [Map(E) || E <- L0],
+    I = {get_map_elements,Fail,Map(M),{list,L}},
+    remap(Is, Map, [I|Acc]);
 remap([{bs_init,Fail,Info,Live,Ss0,Dst0}|Is], Map, Acc) ->
     Ss = [Map(Src) || Src <- Ss0],
     Dst = Map(Dst0),
@@ -275,6 +279,8 @@ frame_size([{kill,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{make_fun2,_,_,_,_}|Is], Safe) ->
     frame_size(Is, Safe);
+frame_size([{get_map_elements,{f,L},_,_}|Is], Safe) ->
+    frame_size_branch(L, Is, Safe);
 frame_size([{deallocate,N}|_], _) -> N;
 frame_size([{line,_}|Is], Safe) ->
     frame_size(Is, Safe);