Merge branch 'bjorn/cleanup'

* bjorn/cleanup:
  beam_validator: Don't allow an 'undefined' entry label in a function
  beam_validator: Remove obsolete DEBUG support
  v3_kernel: Speed up compilation of modules with many funs
  beam_dict: Speed up storage of funs
  beam_asm: Speed up assembly for modules with many exports
  sys_core_dsetel: Use a map instead of a dict
  sys_pre_expand: Cover coerce_to_float/2
  Cover code for callbacks in sys_pre_expand
  Cover sys_pre_expand:pattern/2
  sys_pre_expand: Remove uncovered clause in pat_bit_size/2
  sys_pre_expand: Clean up data structures
  sys_pre_expand: Remove vestiges of variable usage tracking
  sys_pre_expand: Remove imports of ordsets functions
  sys_pre_expand: Remove unnecessary inclusion of erl_bits.hrl
  io: Make a fast code path for i/o requests

1 files changed, 10 insertions, 7 deletions

diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 7ee564683b..011748df3a 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -117,7 +117,7 @@ copy_anno(Kdst, Ksrc) ->
 	       fcount=0,			%Fun counter
                ds=cerl_sets:new() :: cerl_sets:set(), %Defined variables
 	       funs=[],				%Fun functions
-	       free=[],				%Free variables
+	       free=#{},			%Free variables
 	       ws=[]   :: [warning()],		%Warnings.
 	       guard_refc=0}).			%> 0 means in guard
 
@@ -1837,14 +1837,17 @@ handle_reuse_anno_1(V, _St) -> V.
 %% get_free(Name, Arity, State) -> [Free].
 %% store_free(Name, Arity, [Free], State) -> State.
 
-get_free(F, A, St) ->
-    case orddict:find({F,A}, St#kern.free) of
-	{ok,Val} -> Val;
-	error -> []
+get_free(F, A, #kern{free=FreeMap}) ->
+    Key = {F,A},
+    case FreeMap of
+	#{Key:=Val} -> Val;
+	_ -> []
     end.
 
-store_free(F, A, Free, St) ->
-    St#kern{free=orddict:store({F,A}, Free, St#kern.free)}.
+store_free(F, A, Free, #kern{free=FreeMap0}=St) ->
+    Key = {F,A},
+    FreeMap = FreeMap0#{Key=>Free},
+    St#kern{free=FreeMap}.
 
 break_rets({break,Rs}) -> Rs;
 break_rets(return) -> [].