Merge branch 'master' into sverker/master/load_nif-print-init-error

37 files changed, 740 insertions, 1305 deletions

diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 518c89d044..b5ca6c3c49 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -88,7 +88,6 @@ MODULES =  \
 	sys_core_fold_lists \
 	sys_core_inline \
 	sys_pre_attributes \
-	sys_pre_expand \
 	v3_codegen \
 	v3_core \
 	v3_kernel \
@@ -198,7 +197,6 @@ $(EBIN)/sys_core_dsetel.beam: core_parse.hrl
 $(EBIN)/sys_core_fold.beam: core_parse.hrl
 $(EBIN)/sys_core_fold_lists.beam: core_parse.hrl
 $(EBIN)/sys_core_inline.beam: core_parse.hrl
-$(EBIN)/sys_pre_expand.beam: ../../stdlib/include/erl_bits.hrl
 $(EBIN)/v3_codegen.beam: v3_life.hrl
 $(EBIN)/v3_core.beam: core_parse.hrl
 $(EBIN)/v3_kernel.beam: core_parse.hrl v3_kernel.hrl
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index ec41925beb..6a35191f6e 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -58,13 +58,6 @@ blockify(Is) ->
 blockify([{loop_rec,{f,Fail},{x,0}},{loop_rec_end,_Lbl},{label,Fail}|Is], Acc) ->
     %% Useless instruction sequence.
     blockify(Is, Acc);
-blockify([{get_map_elements,F,S,{list,Gets}}|Is0], Acc) ->
-    %% A get_map_elements instruction is only safe at the beginning of
-    %% a block because of the failure label.
-    {Ss,Ds} = beam_utils:split_even(Gets),
-    I = {set,Ds,[S|Ss],{get_map_elements,F}},
-    {Block,Is} = collect_block(Is0, [I]),
-    blockify(Is, [{block,Block}|Acc]);
 blockify([I|Is0]=IsAll, Acc) ->
     case collect(I) of
 	error -> blockify(Is0, [I|Acc]);
@@ -220,7 +213,6 @@ move_allocates_1([], Acc) -> Acc.
 
 alloc_may_pass({set,_,_,{alloc,_,_}}) -> false;
 alloc_may_pass({set,_,_,{set_tuple_element,_}}) -> false;
-alloc_may_pass({set,_,_,{get_map_elements,_}}) -> false;
 alloc_may_pass({set,_,_,put_list}) -> false;
 alloc_may_pass({set,_,_,put}) -> false;
 alloc_may_pass({set,_,_,_}) -> true.
@@ -235,8 +227,6 @@ opt([{set,_,_,{line,_}}=Line1,
      {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is])
   when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
     opt([Line2,I2,Line1,I1|Is]);
-opt([{set,[_|_],_Ss,{get_map_elements,_F}}=I|Is]) ->
-    [I|opt(Is)];
 opt([{set,Ds0,Ss,Op}|Is0]) ->
     {Ds,Is} = opt_moves(Ds0, Is0),
     [{set,Ds,Ss,Op}|opt(Is)];
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index 6f6d742293..3606af9d75 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -272,14 +272,18 @@ backward([{jump,{f,To}}=J|[{bif,Op,_,Ops,Reg}|Is]=Is0], D, Acc) ->
     catch
 	throw:not_possible -> backward(Is0, D, [J|Acc])
     end;
-backward([{test,bs_start_match2,F,_,[R,_],Ctxt}=I|Is], D,
+backward([{test,bs_start_match2,F,Live,[R,_]=Args,Ctxt}|Is], D,
 	 [{test,bs_match_string,F,[Ctxt,Bs]},
 	  {test,bs_test_tail2,F,[Ctxt,0]}|Acc0]=Acc) ->
+    {f,To0} = F,
     case beam_utils:is_killed(Ctxt, Acc0, D) of
 	true ->
-	    Eq = {test,is_eq_exact,F,[R,{literal,Bs}]},
+	    To = shortcut_bs_context_to_binary(To0, R, D),
+	    Eq = {test,is_eq_exact,{f,To},[R,{literal,Bs}]},
 	    backward(Is, D, [Eq|Acc0]);
 	false ->
+	    To = shortcut_bs_start_match(To0, R, D),
+	    I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
 	    backward(Is, D, [I|Acc])
     end;
 backward([{test,bs_start_match2,{f,To0},Live,[Src|_]=Info,Dst}|Is], D, Acc) ->
@@ -551,6 +555,21 @@ shortcut_bs_start_match_1([{test,bs_start_match2,{f,To},_,[Reg|_],_}|_],
 shortcut_bs_start_match_1(_, _, To, _) ->
     To.
 
+%% shortcut_bs_context_to_binary(TargetLabel, Reg) -> TargetLabel
+%%  If a bs_start_match2 instruction has been eliminated, the
+%%  bs_context_to_binary instruction can be eliminated too.
+
+shortcut_bs_context_to_binary(To, Reg, D) ->
+    shortcut_bs_ctb_1(beam_utils:code_at(To, D), Reg, To, D).
+
+shortcut_bs_ctb_1([{bs_context_to_binary,Reg}|Is], Reg, To, D) ->
+    shortcut_bs_ctb_1(Is, Reg, To, D);
+shortcut_bs_ctb_1([{jump,{f,To}}|_], Reg, _, D) ->
+    Code = beam_utils:code_at(To, D),
+    shortcut_bs_ctb_1(Code, Reg, To, D);
+shortcut_bs_ctb_1(_, _, To, _) ->
+    To.
+
 %% shortcut_rel_op(FailLabel, Operator, [Operand], D) -> FailLabel'
 %%  Try to shortcut the given test instruction. Example:
 %%
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index 36369bd0b4..c9ff07b496 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -64,7 +64,6 @@ norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
 norm({set,[D1,D2],[S],get_list})          -> {get_list,S,D1,D2};
 norm({set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}}) ->
     {put_map,F,Op,S,D,R,{list,Puts}};
-%% get_map_elements is always handled in beam_split (moved out of block)
 norm({set,[],[],remove_message})   -> remove_message;
 norm({set,[],[],fclearerror}) -> fclearerror;
 norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}}.
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 48b5a32814..5311ce7379 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -155,9 +155,7 @@ share(Is0) ->
     Is = eliminate_fallthroughs(Is0, []),
     share_1(Is, #{}, [], []).
 
-share_1([{label,_}=Lbl|Is], Dict, [], Acc) ->
-    share_1(Is, Dict, [], [Lbl|Acc]);
-share_1([{label,L}=Lbl|Is], Dict0, Seq, Acc) ->
+share_1([{label,L}=Lbl|Is], Dict0, [_|_]=Seq, Acc) ->
     case maps:find(Seq, Dict0) of
 	error ->
 	    Dict = maps:put(Seq, L, Dict0),
@@ -208,21 +206,18 @@ sharable_with_try([]) -> true.
 
 %% Eliminate all fallthroughs. Return the result reversed.
 
-eliminate_fallthroughs([I,{label,L}=Lbl|Is], Acc) ->
-    case is_unreachable_after(I) orelse is_label(I) of
+eliminate_fallthroughs([{label,L}=Lbl|Is], [I|_]=Acc) ->
+    case is_unreachable_after(I) of
 	false ->
 	    %% Eliminate fallthrough.
-	    eliminate_fallthroughs(Is, [Lbl,{jump,{f,L}},I|Acc]);
+	    eliminate_fallthroughs(Is, [Lbl,{jump,{f,L}}|Acc]);
 	true ->
-	    eliminate_fallthroughs(Is, [Lbl,I|Acc])
+	    eliminate_fallthroughs(Is, [Lbl|Acc])
     end;
 eliminate_fallthroughs([I|Is], Acc) ->
     eliminate_fallthroughs(Is, [I|Acc]);
 eliminate_fallthroughs([], Acc) -> Acc.
 
-is_label({label,_}) -> true;
-is_label(_) -> false.
-    
 %%%
 %%% (2) Move short code sequences ending in an instruction that causes an exit
 %%% to the end of the function.
diff --git a/lib/compiler/src/beam_listing.erl b/lib/compiler/src/beam_listing.erl
index ce566373bb..d82ed8639d 100644
--- a/lib/compiler/src/beam_listing.erl
+++ b/lib/compiler/src/beam_listing.erl
@@ -49,10 +49,6 @@ module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
 			[Name, Arity, Entry]),
 	      io:put_chars(Stream, format_asm(Asm))
       end, Code);
-module(Stream, {Mod,Exp,Inter}) ->
-    %% Other kinds of intermediate formats.
-    io:fwrite(Stream, "~w.~n~p.~n", [Mod,Exp]),
-    foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Inter);
 module(Stream, [_|_]=Fs) ->
     %% Form-based abstract format.
     foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Fs).
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
index c83c686953..feeab0af50 100644
--- a/lib/compiler/src/beam_split.erl
+++ b/lib/compiler/src/beam_split.erl
@@ -56,9 +56,6 @@ split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
 	    Bl, Acc) when Lbl =/= 0 ->
     split_block(Is, [], [{put_map,Fail,Op,S,D,R,{list,Puts}}|
 			 make_block(Bl, Acc)]);
-split_block([{set,Ds,[S|Ss],{get_map_elements,Fail}}|Is], Bl, Acc) ->
-    Gets = beam_utils:join_even(Ss,Ds),
-    split_block(Is, [], [{get_map_elements,Fail,S,{list,Gets}}|make_block(Bl, Acc)]);
 split_block([{set,[R],[],{try_catch,Op,L}}|Is], Bl, Acc) ->
     split_block(Is, [], [{Op,R,L}|make_block(Bl, Acc)]);
 split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) ->
diff --git a/lib/compiler/src/beam_trim.erl b/lib/compiler/src/beam_trim.erl
index a8dc6805bc..d40669083e 100644
--- a/lib/compiler/src/beam_trim.erl
+++ b/lib/compiler/src/beam_trim.erl
@@ -230,7 +230,7 @@ safe_labels([], Acc) -> gb_sets:from_list(Acc).
 
 frame_layout(Is, Kills, #st{safe=Safe,lbl=D}) ->
     N = frame_size(Is, Safe),
-    IsKilled = fun(R) -> beam_utils:is_killed(R, Is, D) end,
+    IsKilled = fun(R) -> beam_utils:is_not_used(R, Is, D) end,
     {N,frame_layout_1(Kills, 0, N, IsKilled, [])}.
 
 frame_layout_1([{kill,{y,Y}}=I|Ks], Y, N, IsKilled, Acc) ->
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index acaf3ede66..b4776294be 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -592,6 +592,8 @@ is_math_bif(log10, 1) -> true;
 is_math_bif(sqrt, 1) -> true;
 is_math_bif(atan2, 2) -> true;
 is_math_bif(pow, 2) -> true;
+is_math_bif(ceil, 1) -> true;
+is_math_bif(floor, 1) -> true;
 is_math_bif(pi, 0) -> true;
 is_math_bif(_, _) -> false.
 
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index a15ecf633e..564a62a7f2 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -26,13 +26,12 @@
 	 empty_label_index/0,index_label/3,index_labels/1,
 	 code_at/2,bif_to_test/3,is_pure_test/1,
 	 live_opt/1,delete_live_annos/1,combine_heap_needs/2,
-	 join_even/2,split_even/1]).
+	 split_even/1]).
 
 -import(lists, [member/2,sort/1,reverse/1,splitwith/2]).
 
 -record(live,
-	{bl,					%Block check fun.
-	 lbl,					%Label to code index.
+	{lbl,					%Label to code index.
 	 res}).					%Result cache for each label.
 
 
@@ -45,12 +44,16 @@
 %%  i.e. it is OK to enter the instruction sequence with Register
 %%  containing garbage.
 
-is_killed_block(R, Is) ->
-    case check_killed_block(R, Is) of
-	killed -> true;
-	used -> false;
-	transparent -> false
-    end.
+is_killed_block({x,X}, [{set,_,_,{alloc,Live,_}}|_]) ->
+    X >= Live;
+is_killed_block(R, [{set,Ds,Ss,_Op}|Is]) ->
+    not member(R, Ss) andalso (member(R, Ds) orelse is_killed_block(R, Is));
+is_killed_block(R, [{'%live',_,Regs}|Is]) ->
+    case R of
+	{x,X} when (Regs bsr X) band 1 =:= 0 -> true;
+	_ -> is_killed_block(R, Is)
+    end;
+is_killed_block(_, []) -> false.
 
 %% is_killed(Register, [Instruction], State) -> true|false
 %%  Determine whether a register is killed by the instruction sequence.
@@ -63,20 +66,20 @@ is_killed_block(R, Is) ->
 %%  to determine the kill state across branches.
 
 is_killed(R, Is, D) ->
-    St = #live{bl=check_killed_block_fun(),lbl=D,res=gb_trees:empty()},
+    St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
 	{killed,_} -> true;
-	{used,_} -> false
+	{_,_} -> false
     end.
 
 %% is_killed_at(Reg, Lbl, State) -> true|false
 %%  Determine whether Reg is killed at label Lbl.
 
 is_killed_at(R, Lbl, D) when is_integer(Lbl) ->
-    St0 = #live{bl=check_killed_block_fun(),lbl=D,res=gb_trees:empty()},
+    St0 = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness_at(R, Lbl, St0) of
 	{killed,_} -> true;
-	{used,_} -> false
+	{_,_} -> false
     end.
 
 %% is_not_used(Register, [Instruction], State) -> true|false
@@ -87,10 +90,10 @@ is_killed_at(R, Lbl, D) when is_integer(Lbl) ->
 %%  across branches.
 
 is_not_used(R, Is, D) ->
-    St = #live{bl=fun check_used_block/3,lbl=D,res=gb_trees:empty()},
+    St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
-	{killed,_} -> true;
-	{used,_} -> false
+	{used,_} -> false;
+	{_,_} -> true
     end.
 
 %% is_not_used(Register, [Instruction], State) -> true|false
@@ -101,10 +104,10 @@ is_not_used(R, Is, D) ->
 %%  across branches.
 
 is_not_used_at(R, Lbl, D) ->
-    St = #live{bl=fun check_used_block/3,lbl=D,res=gb_trees:empty()},
+    St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness_at(R, Lbl, St) of
-	{killed,_} -> true;
-	{used,_} -> false
+	{used,_} -> false;
+	{_,_} -> true
     end.
 
 %% index_labels(FunctionIs) -> State
@@ -233,11 +236,6 @@ combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) ->
 
 split_even(Rs) -> split_even(Rs, [], []).
 
-%% join_even/1
-%% {[1,3,5],[2,4,6]} -> [1,2,3,4,5,6]
-
-join_even([], []) -> [];
-join_even([S|Ss], [D|Ds]) -> [S,D|join_even(Ss, Ds)].
 
 %%%
 %%% Local functions.
@@ -245,15 +243,19 @@ join_even([S|Ss], [D|Ds]) -> [S,D|join_even(Ss, Ds)].
 
 
 %% check_liveness(Reg, [Instruction], #live{}) ->
-%%                      {killed | used, #live{}}
+%%                      {killed | not_used | used, #live{}}
 %%  Find out whether Reg is used or killed in instruction sequence.
-%%  'killed' means that Reg is assigned a new value or killed by an
-%%  allocation instruction. 'used' means that Reg is used in some way.
+%%
+%%    killed - Reg is assigned or killed by an allocation instruction.
+%%    not_used - the value of Reg is not used, but Reg must not be garbage
+%%    used - Reg is used
 
-check_liveness(R, [{block,Blk}|Is], #live{bl=BlockCheck}=St0) ->
-    case BlockCheck(R, Blk, St0) of
-	{transparent,St} -> check_liveness(R, Is, St);
-	{Other,_}=Res when is_atom(Other) -> Res
+check_liveness(R, [{block,Blk}|Is], St0) ->
+    case check_liveness_block(R, Blk, St0) of
+	{transparent,St1} ->
+	    check_liveness(R, Is, St1);
+	{Other,_}=Res when is_atom(Other) ->
+	    Res
     end;
 check_liveness(R, [{label,_}|Is], St) ->
     check_liveness(R, Is, St);
@@ -263,8 +265,12 @@ check_liveness(R, [{test,_,{f,Fail},As}|Is], St0) ->
 	    {used,St0};
 	false ->
 	    case check_liveness_at(R, Fail, St0) of
-		{killed,St} -> check_liveness(R, Is, St);
-		{_,_}=Other -> Other
+		{killed,St1} ->
+		    check_liveness(R, Is, St1);
+		{not_used,St1} ->
+		    not_used(check_liveness(R, Is, St1));
+		{used,_}=Used ->
+		    Used
 	    end
     end;
 check_liveness(R, [{test,Op,Fail,Live,Ss,Dst}|Is], St) ->
@@ -334,7 +340,7 @@ check_liveness(R, [{call,Live,_}|Is], St) ->
     case R of
 	{x,X} when X < Live -> {used,St};
 	{x,_} -> {killed,St};
-	{y,_} -> check_liveness(R, Is, St)
+	{y,_} -> not_used(check_liveness(R, Is, St))
     end;
 check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
     case R of
@@ -345,7 +351,7 @@ check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
 	{y,_} ->
 	    case beam_jump:is_exit_instruction(I) of
 		false ->
-		    check_liveness(R, Is, St);
+		    not_used(check_liveness(R, Is, St));
 		true ->
 		    %% We must make sure we don't check beyond this
 		    %% instruction or we will fall through into random
@@ -357,43 +363,20 @@ check_liveness(R, [{call_fun,Live}|Is], St) ->
     case R of
 	{x,X} when X =< Live -> {used,St};
 	{x,_} -> {killed,St};
-	{y,_} -> check_liveness(R, Is, St)
+	{y,_} -> not_used(check_liveness(R, Is, St))
     end;
 check_liveness(R, [{apply,Args}|Is], St) ->
     case R of
 	{x,X} when X < Args+2 -> {used,St};
 	{x,_} -> {killed,St};
-	{y,_} -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bif,Op,{f,Fail},Ss,D}|Is], St0) ->
-    case check_liveness_fail(R, Op, Ss, Fail, St0) of
-	{killed,St} = Killed ->
-	    case member(R, Ss) of
-		true -> {used,St};
-		false when R =:= D -> Killed;
-		false -> check_liveness(R, Is, St)
-	    end;
-	Other ->
-	    Other
-    end;
-check_liveness(R, [{gc_bif,Op,{f,Fail},Live,Ss,D}|Is], St0) ->
-    case R of
-	{x,X} when X >= Live ->
-	    {killed,St0};
-	{x,_} ->
-	    {used,St0};
-	_ ->
-	    case check_liveness_fail(R, Op, Ss, Fail, St0) of
-		{killed,St}=Killed ->
-		    case member(R, Ss) of
-			true -> {used,St};
-			false when R =:= D -> Killed;
-			false -> check_liveness(R, Is, St)
-		    end;
-		Other ->
-		    Other
-	    end
-    end;
+	{y,_} -> not_used(check_liveness(R, Is, St))
+    end;
+check_liveness(R, [{bif,Op,Fail,Ss,D}|Is], St) ->
+    Set = {set,[D],Ss,{bif,Op,Fail}},
+    check_liveness(R, [{block,[Set]}|Is], St);
+check_liveness(R, [{gc_bif,Op,{f,Fail},Live,Ss,D}|Is], St) ->
+    Set = {set,[D],Ss,{alloc,Live,{gc_bif,Op,Fail}}},
+    check_liveness(R, [{block,[Set]}|Is], St);
 check_liveness(R, [{bs_put,{f,0},_,Ss}|Is], St) ->
     case member(R, Ss) of
 	true -> {used,St};
@@ -419,7 +402,7 @@ check_liveness(R, [{make_fun2,_,_,_,NumFree}|Is], St) ->
     case R of
 	{x,X} when X < NumFree -> {used,St};
 	{x,_} -> {killed,St};
-	_ -> check_liveness(R, Is, St)
+	{y,_} -> not_used(check_liveness(R, Is, St))
     end;
 check_liveness({x,_}=R, [{'catch',_,_}|Is], St) ->
     %% All x registers will be killed if an exception occurs.
@@ -488,18 +471,9 @@ check_liveness(R, [{get_map_elements,{f,Fail},S,{list,L}}|Is], St0) ->
 		    Other
 	    end
     end;
-check_liveness(R, [{put_map,{f,_},_,Src,_D,Live,{list,_}}|_], St0) ->
-    case R of
-	Src ->
-	    {used,St0};
-	{x,X} when X < Live ->
-	    {used,St0};
-	{x,_} ->
-	    {killed,St0};
-	{y,_} ->
-	    %% Conservatively mark it as used.
-	    {used,St0}
-    end;
+check_liveness(R, [{put_map,F,Op,S,D,Live,{list,Puts}}|Is], St) ->
+    Set = {set,[D],[S|Puts],{alloc,Live,{put_map,Op,F}}},
+    check_liveness(R, [{block,[Set]}||Is], St);
 check_liveness(R, [{test_heap,N,Live}|Is], St) ->
     I = {block,[{set,[],[],{alloc,Live,{nozero,nostack,N,[]}}}]},
     check_liveness(R, [I|Is], St);
@@ -512,16 +486,24 @@ check_liveness(R, [{get_list,S,D1,D2}|Is], St) ->
 check_liveness(_R, Is, St) when is_list(Is) ->
     %% Not implemented. Conservatively assume that the register is used.
     {used,St}.
-    
-check_liveness_everywhere(R, [{f,Lbl}|T], St0) ->
-    case check_liveness_at(R, Lbl, St0) of
-	{killed,St} -> check_liveness_everywhere(R, T, St);
-	{_,_}=Other -> Other
+
+check_liveness_everywhere(R, Lbls, St0) ->
+    check_liveness_everywhere_1(R, Lbls, killed, St0).
+
+check_liveness_everywhere_1(R, [{f,Lbl}|T], Res0, St0) ->
+    {Res1,St} = check_liveness_at(R, Lbl, St0),
+    Res = case Res1 of
+	      killed -> Res0;
+	      _ -> Res1
+	  end,
+    case Res of
+	used -> {used,St};
+	_ -> check_liveness_everywhere_1(R, T, Res, St)
     end;
-check_liveness_everywhere(R, [_|T], St) ->
-    check_liveness_everywhere(R, T, St);
-check_liveness_everywhere(_, [], St) ->
-    {killed,St}.
+check_liveness_everywhere_1(R, [_|T], Res, St) ->
+    check_liveness_everywhere_1(R, T, Res, St);
+check_liveness_everywhere_1(_, [], Res, St) ->
+    {Res,St}.
 
 check_liveness_at(R, Lbl, #live{lbl=Ll,res=ResMemorized}=St0) ->
     case gb_trees:lookup(Lbl, ResMemorized) of
@@ -535,56 +517,20 @@ check_liveness_at(R, Lbl, #live{lbl=Ll,res=ResMemorized}=St0) ->
 	    {Res,St#live{res=gb_trees:insert(Lbl, Res, St#live.res)}}
     end.
 
+not_used({killed,St}) -> {not_used,St};
+not_used({_,_}=Res) -> Res.
+
 check_liveness_ret(R, R, St) -> {used,St};
 check_liveness_ret(_, _, St) -> {killed,St}.
 
-check_liveness_fail(_, _, _, 0, St) ->
-    {killed,St};
-check_liveness_fail(R, Op, Args, Fail, St) ->
-    Arity = length(Args),
-    case erl_internal:comp_op(Op, Arity) orelse
-	erl_internal:new_type_test(Op, Arity) of
-	true -> {killed,St};
-	false -> check_liveness_at(R, Fail, St)
-    end.
-
-%% check_killed_block(Reg, [Instruction], State) -> killed | transparent | used
+%% check_liveness_block(Reg, [Instruction], State) ->
+%%     {killed | not_used | 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 allocation instruction
-%%    transparent - Reg is neither used nor killed
-%%    used - Reg is used or referenced by an allocation instruction.
-%%  
-%%    (Unknown instructions will cause an exception.)
-
-check_killed_block_fun() ->
-    fun(R, Is, St) -> {check_killed_block(R, Is),St} end.
-
-check_killed_block({x,X}, [{set,_,_,{alloc,Live,_}}|_]) ->
-    if 
-	X >= Live -> killed;
-	true -> used
-    end;
-check_killed_block(R, [{set,Ds,Ss,_Op}|Is]) ->
-    case member(R, Ss) of
-	true -> used;
-	false ->
-	    case member(R, Ds) of
-		true -> killed;
-		false -> check_killed_block(R, Is)
-	    end
-    end;
-check_killed_block(R, [{'%live',_,Regs}|Is]) ->
-    case R of
-	{x,X} when (Regs bsr X) band 1 =:= 0 -> killed;
-	_ -> check_killed_block(R, Is)
-    end;
-check_killed_block(_, []) -> transparent.
-
-%% check_used_block(Reg, [Instruction], State) -> killed | transparent | used
-%%  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 allocation instruction
+%%    killed - Reg is assigned a new value or killed by an
+%%       allocation instruction
+%%    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
 %%    used - Reg is explicitly used by an instruction
 %%
@@ -592,45 +538,64 @@ check_killed_block(_, []) -> transparent.
 %%
 %%  (Unknown instructions will cause an exception.)
 
-check_used_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], St) ->
+check_liveness_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], St0) ->
     if 
-	X >= Live -> {killed,St};
-	true -> check_used_block_1(R, Ss, Ds, Op, Is, St)
+	X >= Live ->
+	    {killed,St0};
+	true ->
+	    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
+		{killed,St} -> {not_used,St};
+		{transparent,St} -> {not_used,St};
+		{_,_}=Res -> Res
+	    end
     end;
-check_used_block(R, [{set,Ds,Ss,Op}|Is], St) ->
-    check_used_block_1(R, Ss, Ds, Op, Is, St);
-check_used_block(_, [], St) -> {transparent,St}.
+check_liveness_block({y,_}=R, [{set,Ds,Ss,{alloc,_Live,Op}}|Is], St) ->
+    check_liveness_block_1(R, Ss, Ds, Op, Is, St);
+check_liveness_block(R, [{set,Ds,Ss,Op}|Is], St) ->
+    check_liveness_block_1(R, Ss, Ds, Op, Is, St);
+check_liveness_block(_, [], St) -> {transparent,St}.
 
-check_used_block_1(R, Ss, Ds, Op, Is, St0) ->
+check_liveness_block_1(R, Ss, Ds, Op, Is, St0) ->
     case member(R, Ss) of
 	true ->
 	    {used,St0};
 	false ->
-	    case is_reg_used_at(R, Op, St0) of
-		{true,St} ->
-		    {used,St};
-		{false,St} ->
+	    case check_liveness_block_2(R, Op, Ss, St0) of
+		{killed,St} ->
 		    case member(R, Ds) of
 			true -> {killed,St};
-			false -> check_used_block(R, Is, St)
-		    end
+			false -> check_liveness_block(R, Is, St)
+		    end;
+		{not_used,St} ->
+		    not_used(case member(R, Ds) of
+				 true -> {killed,St};
+				 false -> check_liveness_block(R, Is, St)
+			     end);
+		{used,St} ->
+		    {used,St}
 	    end
     end.
 
-is_reg_used_at(R, {gc_bif,_,{f,Lbl}}, St) ->
-    is_reg_used_at_1(R, Lbl, St);
-is_reg_used_at(R, {bif,_,{f,Lbl}}, St) ->
-    is_reg_used_at_1(R, Lbl, St);
-is_reg_used_at(_, _, St) ->
-    {false,St}.
+check_liveness_block_2(R, {gc_bif,_Op,{f,Lbl}}, _Ss, St) ->
+    check_liveness_block_3(R, Lbl, St);
+check_liveness_block_2(R, {bif,Op,{f,Lbl}}, Ss, St) ->
+    Arity = length(Ss),
+    case erl_internal:comp_op(Op, Arity) orelse
+	erl_internal:new_type_test(Op, Arity) of
+	true ->
+	    {killed,St};
+	false ->
+	    check_liveness_block_3(R, Lbl, St)
+    end;
+check_liveness_block_2(R, {put_map,_Op,{f,Lbl}}, _Ss, St) ->
+    check_liveness_block_3(R, Lbl, St);
+check_liveness_block_2(_, _, _, St) ->
+    {killed,St}.
 
-is_reg_used_at_1(_, 0, St) ->
-    {false,St};
-is_reg_used_at_1(R, Lbl, St0) ->
-    case check_liveness_at(R, Lbl, St0) of
-	{killed,St} -> {false,St};
-	{used,St} -> {true,St}
-    end.
+check_liveness_block_3(_, 0, St) ->
+    {killed,St};
+check_liveness_block_3(R, Lbl, St0) ->
+    check_liveness_at(R, Lbl, St0).
 
 index_labels_1([{label,Lbl}|Is0], Acc) ->
     Is = drop_labels(Is0),
@@ -753,6 +718,11 @@ live_opt([timeout=I|Is], _, D, Acc) ->
     live_opt(Is, 0, D, [I|Acc]);
 live_opt([{wait,_}=I|Is], _, D, Acc) ->
     live_opt(Is, 0, D, [I|Acc]);
+live_opt([{get_map_elements,Fail,Src,{list,List}}=I|Is], Regs0, D, Acc) ->
+    {Ss,Ds} = split_even(List),
+    Regs1 = x_live([Src|Ss], x_dead(Ds, Regs0)),
+    Regs = live_join_label(Fail, D, Regs1),
+    live_opt(Is, Regs, D, [I|Acc]);
 
 %% Transparent instructions - they neither use nor modify x registers.
 live_opt([{deallocate,_}=I|Is], Regs, D, Acc) ->
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 16dba35adc..6e53f53a20 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -909,7 +909,7 @@ all_ms_in_x_regs(Live0, Vst) ->
 
 ms_in_y_regs(Id, #vst{current=#st{y=Ys0}}) ->
     Ys = gb_trees:to_list(Ys0),
-    [Y || {Y,#ms{id=OtherId}} <- Ys, OtherId =:= Id].
+    [{y,Y} || {Y,#ms{id=OtherId}} <- Ys, OtherId =:= Id].
 
 verify_call_match_context(Lbl, Ctx, #vst{ft=Ft}) ->
     case gb_trees:lookup(Lbl, Ft) of
@@ -1508,7 +1508,9 @@ bif_type(abs, [Num], Vst) ->
 bif_type(float, _, _) -> {float,[]};
 bif_type('/', _, _) -> {float,[]};
 %% Integer operations.
+bif_type(ceil, [_], _) -> {integer,[]};
 bif_type('div', [_,_], _) -> {integer,[]};
+bif_type(floor, [_], _) -> {integer,[]};
 bif_type('rem', [_,_], _) -> {integer,[]};
 bif_type(length, [_], _) -> {integer,[]};
 bif_type(size, [_], _) -> {integer,[]};
@@ -1642,6 +1644,8 @@ return_type_math(log10, 1) -> {float,[]};
 return_type_math(sqrt, 1) -> {float,[]};
 return_type_math(atan2, 2) -> {float,[]};
 return_type_math(pow, 2) -> {float,[]};
+return_type_math(ceil, 1) -> {float,[]};
+return_type_math(floor, 1) -> {float,[]};
 return_type_math(pi, 0) -> {float,[]};
 return_type_math(F, A) when is_atom(F), is_integer(A), A >= 0 -> term.
 
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index e951a25e04..e4fb703939 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -360,7 +360,7 @@ run_tc({Name,Fun}, St) ->
     T1 = erlang:monotonic_time(),
     Val = (catch Fun(St)),
     T2 = erlang:monotonic_time(),
-    Elapsed = erlang:convert_time_unit(T2 - T1, native, milli_seconds),
+    Elapsed = erlang:convert_time_unit(T2 - T1, native, millisecond),
     Mem0 = erts_debug:flat_size(Val)*erlang:system_info(wordsize),
     Mem = lists:flatten(io_lib:format("~.1f kB", [Mem0/1024])),
     io:format(" ~-30s: ~10.3f s ~12s\n",
@@ -646,13 +646,13 @@ standard_passes() ->
      {iff,'dabstr',{listing,"abstr"}},
      {iff,debug_info,?pass(save_abstract_code)},
 
-     ?pass(expand_module),
+     ?pass(expand_records),
      {iff,'dexp',{listing,"expand"}},
      {iff,'E',{src_listing,"E"}},
      {iff,'to_exp',{done,"E"}},
 
      %% Conversion to Core Erlang.
-     {pass,v3_core},
+     ?pass(core),
      {iff,'dcore',{listing,"core"}},
      {iff,'to_core0',{done,"core"}}
      | core_passes()].
@@ -1227,13 +1227,17 @@ makedep_output(#compile{code=Code,options=Opts,ofile=Ofile}=St) ->
 	    {error,St#compile{errors=St#compile.errors++[Err]}}
     end.
 
-%% expand_module(State) -> State'
-%%  Do the common preprocessing of the input forms.
+expand_records(#compile{code=Code0,options=Opts}=St0) ->
+    Code = erl_expand_records:module(Code0, Opts),
+    {ok,St0#compile{code=Code}}.
 
-expand_module(#compile{code=Code,options=Opts0}=St0) ->
-    {Mod,Exp,Forms,Opts1} = sys_pre_expand:module(Code, Opts0),
+core(#compile{code=Forms,options=Opts0}=St) ->
+    Opts1 = lists:flatten([C || {attribute,_,compile,C} <- Forms] ++ Opts0),
     Opts = expand_opts(Opts1),
-    {ok,St0#compile{module=Mod,options=Opts,code={Mod,Exp,Forms}}}.
+    {ok,Core,Ws} = v3_core:module(Forms, Opts),
+    Mod = cerl:concrete(cerl:module_name(Core)),
+    {ok,St#compile{module=Mod,code=Core,options=Opts,
+		   warnings=St#compile.warnings++Ws}}.
 
 core_fold_module_after_inlining(#compile{code=Code0,options=Opts}=St) ->
     %% Inlining may produce code that generates spurious warnings.
@@ -1808,7 +1812,6 @@ pre_load() ->
 	 erl_scan,
 	 sys_core_dsetel,
 	 sys_core_fold,
-	 sys_pre_expand,
 	 v3_codegen,
 	 v3_core,
 	 v3_kernel,
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index 1fd7800e85..20195ac36f 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -63,7 +63,6 @@
 	     sys_core_fold_lists,
 	     sys_core_inline,
 	     sys_pre_attributes,
-	     sys_pre_expand,
 	     v3_codegen,
 	     v3_core,
 	     v3_kernel,
@@ -73,5 +72,5 @@
   {registered, []},
   {applications, [kernel, stdlib]},
   {env, []},
-  {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-7.0",
+  {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-9.0",
 			  "crypto-3.6"]}]}.
diff --git a/lib/compiler/src/core_pp.erl b/lib/compiler/src/core_pp.erl
index 67209d06be..cff6c7098b 100644
--- a/lib/compiler/src/core_pp.erl
+++ b/lib/compiler/src/core_pp.erl
@@ -179,7 +179,7 @@ format_1(#c_tuple{es=Es}, Ctxt) ->
      format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
      $}
     ];
-format_1(#c_map{arg=#c_literal{anno=[],val=M},es=Es}, Ctxt)
+format_1(#c_map{arg=#c_literal{val=M},es=Es}, Ctxt)
   when is_map(M), map_size(M) =:= 0 ->
     ["~{",
      format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl
index 6b2d781a76..831730ba48 100644
--- a/lib/compiler/src/erl_bifs.erl
+++ b/lib/compiler/src/erl_bifs.erl
@@ -75,10 +75,12 @@ is_pure(erlang, binary_to_list, 1) -> true;
 is_pure(erlang, binary_to_list, 3) -> true;
 is_pure(erlang, bit_size, 1) -> true;
 is_pure(erlang, byte_size, 1) -> true;
+is_pure(erlang, ceil, 1) -> true;
 is_pure(erlang, element, 2) -> true;
 is_pure(erlang, float, 1) -> true;
 is_pure(erlang, float_to_list, 1) -> true;
 is_pure(erlang, float_to_binary, 1) -> true;
+is_pure(erlang, floor, 1) -> true;
 is_pure(erlang, hash, 2) -> false;
 is_pure(erlang, hd, 1) -> true;
 is_pure(erlang, integer_to_binary, 1) -> true;
@@ -129,11 +131,13 @@ is_pure(math, asinh, 1) -> true;
 is_pure(math, atan, 1) -> true;
 is_pure(math, atan2, 2) -> true;
 is_pure(math, atanh, 1) -> true;
+is_pure(math, ceil, 1) -> true;
 is_pure(math, cos, 1) -> true;
 is_pure(math, cosh, 1) -> true;
 is_pure(math, erf, 1) -> true;
 is_pure(math, erfc, 1) -> true;
 is_pure(math, exp, 1) -> true;
+is_pure(math, floor, 1) -> true;
 is_pure(math, log, 1) -> true;
 is_pure(math, log2, 1) -> true;
 is_pure(math, log10, 1) -> true;
@@ -203,7 +207,6 @@ is_safe(erlang, registered, 0) -> true;
 is_safe(erlang, self, 0) -> true;
 is_safe(erlang, term_to_binary, 1) -> true;
 is_safe(erlang, time, 0) -> true;
-is_safe(error_logger, warning_map, 0) -> true;
 is_safe(_, _, _) -> false.
 
 
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 08b02101a6..006bb56bf4 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -83,10 +83,11 @@
 -ifdef(DEBUG).
 -define(ASSERT(E),
 	case E of
-	    true -> ok;
+	    true ->
+		ok;
 	    false ->
 		io:format("~p, line ~p: assertion failed\n", [?MODULE,?LINE]),
-		exit(assertion_failed)
+		error(assertion_failed)
 	end).
 -else.
 -define(ASSERT(E), ignore).
@@ -120,7 +121,10 @@ module(#c_module{defs=Ds0}=Mod, Opts) ->
 
 function_1({#c_var{name={F,Arity}}=Name,B0}) ->
     try
-	B = expr(B0, value, sub_new()),			%This must be a fun!
+	B = find_fixpoint(fun(Core) ->
+				  %% This must be a fun!
+				  expr(Core, value, sub_new())
+			  end, B0, 20),
 	{Name,B}
     catch
 	Class:Error ->
@@ -129,6 +133,14 @@ function_1({#c_var{name={F,Arity}}=Name,B0}) ->
 	    erlang:raise(Class, Error, Stack)
     end.
 
+find_fixpoint(_OptFun, Core, 0) ->
+    Core;
+find_fixpoint(OptFun, Core0, Max) ->
+    case OptFun(Core0) of
+	Core0 -> Core0;
+	Core -> find_fixpoint(OptFun, Core, Max-1)
+    end.
+
 %% body(Expr, Sub) -> Expr.
 %% body(Expr, Context, Sub) -> Expr.
 %%  No special handling of anything except values.
@@ -239,7 +251,7 @@ expr(#c_cons{anno=Anno,hd=H0,tl=T0}=Cons, Ctxt, Sub) ->
     case Ctxt of
 	effect ->
 	    add_warning(Cons, useless_building),
-	    expr(make_effect_seq([H1,T1], Sub), Ctxt, Sub);
+	    make_effect_seq([H1,T1], Sub);
 	value ->
 	    ann_c_cons(Anno, H1, T1)
     end;
@@ -248,7 +260,7 @@ expr(#c_tuple{anno=Anno,es=Es0}=Tuple, Ctxt, Sub) ->
     case Ctxt of
 	effect ->
 	    add_warning(Tuple, useless_building),
-	    expr(make_effect_seq(Es, Sub), Ctxt, Sub);
+	    make_effect_seq(Es, Sub);
 	value ->
 	    ann_c_tuple(Anno, Es)
     end;
@@ -257,7 +269,7 @@ expr(#c_map{anno=Anno,arg=V0,es=Es0}=Map, Ctxt, Sub) ->
     case Ctxt of
 	effect ->
 	    add_warning(Map, useless_building),
-	    expr(make_effect_seq(Es, Sub), Ctxt, Sub);
+	    make_effect_seq(Es, Sub);
 	value ->
 	    V = expr(V0, Ctxt, Sub),
 	    ann_c_map(Anno,V,Es)
@@ -310,7 +322,7 @@ expr(#c_let{}=Let0, Ctxt, Sub) ->
 	Expr ->
 	    %% The let body was successfully moved into the let argument.
 	    %% Now recursively re-process the new expression.
-	    expr(Expr, Ctxt, sub_new_preserve_types(Sub))
+	    Expr
     end;
 expr(#c_letrec{body=#c_var{}}=Letrec, effect, _Sub) ->
     %% This is named fun in an 'effect' context. Warn and ignore.
@@ -364,7 +376,7 @@ expr(#c_case{}=Case0, Ctxt, Sub) ->
                 impossible ->
                     bsm_an(Expr);
                 Other ->
-                    expr(Other, Ctxt, sub_new_preserve_types(Sub))
+		    Other
             end;
 	Other ->
 	    expr(Other, Ctxt, Sub)
@@ -1397,9 +1409,6 @@ sub_new() -> #sub{v=orddict:new(),s=cerl_sets:new(),t=#{}}.
 sub_new(#sub{}=Sub) ->
     Sub#sub{v=orddict:new(),t=#{}}.
 
-sub_new_preserve_types(#sub{}=Sub) ->
-    Sub#sub{v=orddict:new()}.
-
 sub_get_var(#c_var{name=V}=Var, #sub{v=S}) ->
     case orddict:find(V, S) of
 	{ok,Val} -> Val;
@@ -2017,10 +2026,10 @@ case_opt_lit_1(_, []) -> [].
 %%  the clauses where it is actually needed.
 
 case_opt_data(E, Cs0) ->
-    Es = cerl:data_es(E),
     TypeSig = {cerl:data_type(E),cerl:data_arity(E)},
-    try case_opt_data_1(Cs0, Es, TypeSig) of
+    try case_opt_data_1(Cs0, TypeSig) of
 	Cs ->
+	    Es = cerl:data_es(E),
 	    {ok,Es,Cs}
     catch
 	throw:impossible ->
@@ -2028,44 +2037,47 @@ case_opt_data(E, Cs0) ->
 	    {error,Cs0}
     end.
 
-case_opt_data_1([{[P0|Ps0],C,PsAcc,Bs0}|Cs], Es, TypeSig) ->
+case_opt_data_1([{[P0|Ps0],C,PsAcc,Bs0}|Cs], TypeSig) ->
     P = case_opt_compiler_generated(P0),
-    BindTo = #c_var{name=dummy},
-    {Ps1,[{BindTo,_}|Bs1]} = case_data_pat_alias(P, BindTo, TypeSig, []),
-    [{Ps1++Ps0,C,PsAcc,Bs1++Bs0}|case_opt_data_1(Cs, Es, TypeSig)];
-case_opt_data_1([], _, _) -> [].
+    {Ps1,Bs} = case_opt_data_2(P, TypeSig, Bs0),
+    [{Ps1++Ps0,C,PsAcc,Bs}|case_opt_data_1(Cs, TypeSig)];
+case_opt_data_1([], _) -> [].
 
-case_data_pat_alias(P, BindTo0, TypeSig, Bs0) ->
-    case cerl:type(P) of
-	alias ->
-	    %% Recursively handle the pattern and bind to
-	    %% the alias variable.
-	    BindTo = cerl:alias_var(P),
-	    Apat0 = cerl:alias_pat(P),
-	    Ann = [compiler_generated],
-	    Apat = cerl:set_ann(Apat0, Ann),
-	    {Ps,Bs} = case_data_pat_alias(Apat, BindTo, TypeSig, Bs0),
-	    {Ps,[{BindTo0,BindTo}|Bs]};
-	var ->
-	    %% Here we will need to actually build the data and bind
-	    %% it to the variable.
+case_opt_data_2(P, TypeSig, Bs0) ->
+    case case_analyze_pat(P) of
+	{[],Pat} when Pat =/= none ->
+	    DataEs = cerl:data_es(P),
+	    {DataEs,Bs0};
+	{[V|Vs],none} ->
 	    {Type,Arity} = TypeSig,
 	    Ann = [compiler_generated],
 	    Vars = make_vars(Ann, Arity),
 	    Data = cerl:ann_make_data(Ann, Type, Vars),
-	    Bs = [{BindTo0,P},{P,Data}|Bs0],
+	    Bs = [{V,Data} | [{Var,V} || Var <- Vs] ++ Bs0],
 	    {Vars,Bs};
-	_ ->
-	    %% Since case_opt_nomatch/3 has removed all clauses that
-	    %% cannot match, we KNOW that this clause must match and
-	    %% that the pattern must be a data constructor.
-	    %% Here we must build the data and bind it to the variable.
+	{[V|Vs],Pat} when Pat =/= none ->
 	    {Type,_} = TypeSig,
-	    DataEs = cerl:data_es(P),
+	    DataEs = cerl:data_es(Pat),
 	    Vars = pat_to_expr_list(DataEs),
 	    Ann = [compiler_generated],
 	    Data = cerl:ann_make_data(Ann, Type, Vars),
-	    {DataEs,[{BindTo0,Data}]}
+	    Bs = [{V,Data} | [{Var,V} || Var <- Vs] ++ Bs0],
+	    {DataEs,Bs}
+    end.
+
+case_analyze_pat(P) ->
+    case_analyze_pat_1(P, [], none).
+
+case_analyze_pat_1(P, Vs, Pat) ->
+    case cerl:type(P) of
+	alias ->
+	    V = cerl:alias_var(P),
+	    Apat = cerl:alias_pat(P),
+	    case_analyze_pat_1(Apat, [V|Vs], Pat);
+	var ->
+	    {[P|Vs],Pat};
+	_ ->
+	    {Vs,P}
     end.
 
 %% pat_to_expr(Pattern) -> Expression.
@@ -2109,7 +2121,7 @@ make_var(A) ->
 make_var_name() ->
     N = get(new_var_num),
     put(new_var_num, N+1),
-    list_to_atom("fol"++integer_to_list(N)).
+    list_to_atom("@f"++integer_to_list(N)).
 
 letify(Bs, Body) ->
     Ann = cerl:get_ann(Body),
@@ -2216,24 +2228,24 @@ inverse_rel_op('=<') -> '>';
 inverse_rel_op(_) -> no.
 
 
-%% opt_bool_case_in_let(LetExpr, Sub) -> Core
+%% opt_bool_case_in_let(LetExpr) -> Core
 
-opt_bool_case_in_let(#c_let{vars=Vs,arg=Arg,body=B}=Let, Sub) ->
-    opt_case_in_let_1(Vs, Arg, B, Let, Sub).
+opt_bool_case_in_let(#c_let{vars=Vs,arg=Arg,body=B}=Let) ->
+    opt_bool_case_in_let_1(Vs, Arg, B, Let).
 
-opt_case_in_let_1([#c_var{name=V}], Arg,
-		  #c_case{arg=#c_var{name=V}}=Case0, Let, Sub) ->
+opt_bool_case_in_let_1([#c_var{name=V}], Arg,
+		  #c_case{arg=#c_var{name=V}}=Case0, Let) ->
     case is_simple_case_arg(Arg) of
 	true ->
 	    Case = opt_bool_case(Case0#c_case{arg=Arg}),
 	    case core_lib:is_var_used(V, Case) of
-		false -> expr(Case, sub_new(Sub));
+		false -> Case;
 		true -> Let
 	    end;
 	false ->
 	    Let
     end;
-opt_case_in_let_1(_, _, _, Let, _) -> Let.
+opt_bool_case_in_let_1(_, _, _, Let) -> Let.
 
 %% is_simple_case_arg(Expr) -> true|false
 %%  Determine whether the Expr is simple enough to be worth
@@ -2641,25 +2653,23 @@ opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) ->
 		false ->
 		    %% let <Var> = Arg in <OtherVar>  ==>  seq Arg OtherVar
 		    Arg = maybe_suppress_warnings(Arg1, Vs0, PrevBody),
-		    expr(#c_seq{arg=Arg,body=Body}, Ctxt,
-			 sub_new_preserve_types(Sub))
+		    #c_seq{arg=Arg,body=Body}
 	    end;
 	{[],#c_values{es=[]},_} ->
 	    %% No variables left.
 	    Body;
 	{Vs,Arg1,#c_literal{}} ->
 	    Arg = maybe_suppress_warnings(Arg1, Vs, PrevBody),
-	    E = case Ctxt of
-		    effect ->
-			%% Throw away the literal body.
-			Arg;
-		    value ->
-			%% Since the variable is not used in the body, we
-			%% can rewrite the let to a sequence.
-			%%  let <Var> = Arg in Literal ==> seq Arg Literal
-			#c_seq{arg=Arg,body=Body}
-		end,
-	    expr(E, Ctxt, sub_new_preserve_types(Sub));
+	    case Ctxt of
+		effect ->
+		    %% Throw away the literal body.
+		    Arg;
+		value ->
+		    %% Since the variable is not used in the body, we
+		    %% can rewrite the let to a sequence.
+		    %%  let <Var> = Arg in Literal ==> seq Arg Literal
+		    #c_seq{arg=Arg,body=Body}
+	    end;
 	{Vs,Arg1,Body} ->
 	    %% If none of the variables are used in the body, we can
 	    %% rewrite the let to a sequence:
@@ -2668,11 +2678,10 @@ opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) ->
 	    case is_any_var_used(Vs, Body) of
 		false ->
 		    Arg = maybe_suppress_warnings(Arg1, Vs, PrevBody),
-		    expr(#c_seq{arg=Arg,body=Body}, Ctxt,
-			 sub_new_preserve_types(Sub));
+		    #c_seq{arg=Arg,body=Body};
 		true ->
 		    Let1 = Let0#c_let{vars=Vs,arg=Arg1,body=Body},
-		    Let2 = opt_bool_case_in_let(Let1, Sub),
+		    Let2 = opt_bool_case_in_let(Let1),
 		    opt_case_in_let_arg(Let2, Ctxt, Sub)
 	    end
     end.
@@ -2830,16 +2839,16 @@ opt_case_in_let_arg(#c_let{arg=#c_case{}=Case}=Let, Ctxt,
 opt_case_in_let_arg(Let, _, _) -> Let.
 
 opt_case_in_let_arg_1(Let0, #c_case{arg=#c_values{es=[]},
-				   clauses=Cs}=Case0, Ctxt, Sub) ->
+				    clauses=Cs}=Case0, _Ctxt, _Sub) ->
     Let = mark_compiler_generated(Let0),
     case Cs of
 	[#c_clause{body=#c_literal{}=BodyA}=Ca0,
 	 #c_clause{body=#c_literal{}=BodyB}=Cb0] ->
 	    Ca = Ca0#c_clause{body=Let#c_let{arg=BodyA}},
 	    Cb = Cb0#c_clause{body=Let#c_let{arg=BodyB}},
-	    Case = Case0#c_case{clauses=[Ca,Cb]},
-	    expr(Case, Ctxt, sub_new_preserve_types(Sub));
-	_ -> Let
+	    Case0#c_case{clauses=[Ca,Cb]};
+	_ ->
+	    Let
     end;
 opt_case_in_let_arg_1(Let, _, _, _) -> Let.
 
@@ -2950,7 +2959,9 @@ returns_integer(bit_size, [_]) -> true;
 returns_integer('bsl', [_,_]) -> true;
 returns_integer('bsr', [_,_]) -> true;
 returns_integer(byte_size, [_]) -> true;
+returns_integer(ceil, [_]) -> true;
 returns_integer('div', [_,_]) -> true;
+returns_integer(floor, [_]) -> true;
 returns_integer(length, [_]) -> true;
 returns_integer('rem', [_,_]) -> true;
 returns_integer('round', [_]) -> true;
@@ -3440,12 +3451,18 @@ format_error(bin_var_used_in_guard) ->
 verify_scope(E, #sub{s=Scope}) ->
     Free0 = cerl_trees:free_variables(E),
     Free = [V || V <- Free0, not is_tuple(V)],	%Ignore function names.
-    case ordsets:is_subset(Free, cerl_sets:to_list(Scope)) of
-	true -> true;
+    case is_subset_of_scope(Free, Scope) of
+	true ->
+	    true;
 	false ->
 	    io:format("~p\n", [E]),
 	    io:format("~p\n", [Free]),
-	    io:format("~p\n", [cerl_sets:to_list(Scope)]),
+	    io:format("~p\n", [ordsets:from_list(cerl_sets:to_list(Scope))]),
 	    false
     end.
+
+is_subset_of_scope([V|Vs], Scope) ->
+    cerl_sets:is_element(V, Scope) andalso is_subset_of_scope(Vs, Scope);
+is_subset_of_scope([], _) -> true.
+
 -endif.
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
deleted file mode 100644
index 7ab4e1845c..0000000000
--- a/lib/compiler/src/sys_pre_expand.erl
+++ /dev/null
@@ -1,616 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%% Purpose : Expand some source Erlang constructions. This is part of the
-%%           pre-processing phase.
-
-%% N.B. Although structs (tagged tuples) are not yet allowed in the
-%% language there is code included in pattern/2 and expr/3 (commented out)
-%% that handles them by transforming them to tuples.
-
--module(sys_pre_expand).
-
-%% Main entry point.
--export([module/2]).
-
--import(lists,   [member/2,foldl/3,foldr/3]).
-
--type fa() :: {atom(), arity()}.
-
--record(expand, {module=[],                     %Module name
-                 exports=[],                    %Exports
-                 attributes=[],                 %Attributes
-                 callbacks=[],                  %Callbacks
-                 optional_callbacks=[] :: [fa()],  %Optional callbacks
-                 vcount=0,                      %Variable counter
-                 func=[],                       %Current function
-                 arity=[],                      %Arity for current function
-                 fcount=0,			%Local fun count
-		 ctype				%Call type map
-                }).
-
-%% module(Forms, CompileOptions)
-%%      {ModuleName,Exports,TransformedForms,CompileOptions'}
-%%  Expand the forms in one module.
-%%
-%%  CompileOptions is augmented with options from -compile attributes.
-
-module(Fs0, Opts0) ->
-
-    %% Expand records. Normalise guard tests.
-    Fs = erl_expand_records:module(Fs0, Opts0),
-
-    Opts = compiler_options(Fs) ++ Opts0,
-
-    %% Set pre-defined exported functions.
-    PreExp = [{module_info,0},{module_info,1}],
-
-    %% Build the set of defined functions and the initial call
-    %% type map.
-    Defined = defined_functions(Fs, PreExp),
-    Ctype = maps:from_list([{K,local} || K <- Defined]),
-
-    %% Build initial expand record.
-    St0 = #expand{exports=PreExp,
-		  ctype=Ctype
-                 },
-
-    %% Expand the functions.
-    {Tfs,St1} = forms(Fs, St0),
-
-    %% Get the correct list of exported functions.
-    Exports = case member(export_all, Opts) of
-                  true -> Defined;
-                  false -> St1#expand.exports
-              end,
-    St2 = St1#expand{exports=Exports,ctype=undefined},
-
-    %% Generate all functions from stored info.
-    {Ats,St3} = module_attrs(St2),
-    {Mfs,St4} = module_predef_funcs(St3),
-    {St4#expand.module, St4#expand.exports, Ats ++ Tfs ++ Mfs,
-     Opts}.
-
-compiler_options(Forms) ->
-    lists:flatten([C || {attribute,_,compile,C} <- Forms]).
-    
-%% defined_function(Forms, Predef) -> Functions.
-%%  Add function to defined if form is a function.
-
-defined_functions(Forms, Predef) ->
-    Fs = foldl(fun({function,_,N,A,_Cs}, Acc) -> [{N,A}|Acc];
-                  (_, Acc) -> Acc
-               end, Predef, Forms),
-    ordsets:from_list(Fs).
-
-module_attrs(#expand{attributes=Attributes}=St) ->
-    Attrs = [{attribute,Line,Name,Val} || {Name,Line,Val} <- Attributes],
-    Callbacks = [Callback || {_,_,callback,_}=Callback <- Attrs],
-    OptionalCallbacks = get_optional_callbacks(Attrs),
-    {Attrs,St#expand{callbacks=Callbacks,
-                     optional_callbacks=OptionalCallbacks}}.
-
-get_optional_callbacks(Attrs) ->
-    L = [O ||
-            {attribute, _, optional_callbacks, O} <- Attrs,
-            is_fa_list(O)],
-    lists:append(L).
-
-is_fa_list([{FuncName, Arity}|L])
-  when is_atom(FuncName), is_integer(Arity), Arity >= 0 ->
-    is_fa_list(L);
-is_fa_list([]) -> true;
-is_fa_list(_) -> false.
-
-module_predef_funcs(St0) ->
-    {Mpf1,St1} = module_predef_func_beh_info(St0),
-    Mpf2 = module_predef_funcs_mod_info(St1),
-    Mpf = [erl_parse:new_anno(F) || F <- Mpf1++Mpf2],
-    {Mpf,St1}.
-
-module_predef_func_beh_info(#expand{callbacks=[]}=St) ->
-    {[], St};
-module_predef_func_beh_info(#expand{callbacks=Callbacks,
-                                    optional_callbacks=OptionalCallbacks,
-				    exports=Exports}=St) ->
-    PreDef0 = [{behaviour_info,1}],
-    PreDef = ordsets:from_list(PreDef0),
-    {[gen_beh_info(Callbacks, OptionalCallbacks)],
-     St#expand{exports=ordsets:union(PreDef, Exports)}}.
-
-gen_beh_info(Callbacks, OptionalCallbacks) ->
-    List = make_list(Callbacks),
-    OptionalList = make_optional_list(OptionalCallbacks),
-    {function,0,behaviour_info,1,
-     [{clause,0,[{atom,0,callbacks}],[],
-       [List]},
-      {clause,0,[{atom,0,optional_callbacks}],[],
-       [OptionalList]}]}.
-
-make_list([]) -> {nil,0};
-make_list([{_,_,_,[{{Name,Arity},_}]}|Rest]) ->
-    {cons,0,
-     {tuple,0,
-      [{atom,0,Name},
-       {integer,0,Arity}]},
-     make_list(Rest)}.
-
-make_optional_list([]) -> {nil,0};
-make_optional_list([{Name,Arity}|Rest]) ->
-    {cons,0,
-     {tuple,0,
-      [{atom,0,Name},
-       {integer,0,Arity}]},
-     make_optional_list(Rest)}.
-
-module_predef_funcs_mod_info(#expand{module=Mod}) ->
-    ModAtom = {atom,0,Mod},
-    [{function,0,module_info,0,
-      [{clause,0,[],[],
-        [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
-          [ModAtom]}]}]},
-     {function,0,module_info,1,
-      [{clause,0,[{var,0,'X'}],[],
-        [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
-          [ModAtom,{var,0,'X'}]}]}]}].
-
-%% forms(Forms, State) ->
-%%      {TransformedForms,State'}
-%%  Process the forms. Attributes are lost and just affect the state.
-%%  Ignore uninteresting forms like eof and type.
-
-forms([{attribute,_,file,_File}=F|Fs0], St0) ->
-    {Fs,St1} = forms(Fs0, St0),
-    {[F|Fs],St1};
-forms([{attribute,Line,Name,Val}|Fs0], St0) ->
-    St1 = attribute(Name, Val, Line, St0),
-    forms(Fs0, St1);
-forms([{function,L,N,A,Cs}|Fs0], St0) ->
-    {Ff,St1} = function(L, N, A, Cs, St0),
-    {Fs,St2} = forms(Fs0, St1),
-    {[Ff|Fs],St2};
-forms([_|Fs], St) -> forms(Fs, St);
-forms([], St) -> {[],St}.
-
-%% attribute(Attribute, Value, Line, State) -> State'.
-%%  Process an attribute, this just affects the state.
-
-attribute(module, Module, _L, St) ->
-    true = is_atom(Module),
-    St#expand{module=Module};
-attribute(export, Es, _L, St) ->
-    St#expand{exports=ordsets:union(ordsets:from_list(Es),
-				    St#expand.exports)};
-attribute(import, Is, _L, St) ->
-    import(Is, St);
-attribute(compile, _C, _L, St) ->
-    St;
-attribute(Name, Val, Line, St) when is_list(Val) ->
-    St#expand{attributes=St#expand.attributes ++ [{Name,Line,Val}]};
-attribute(Name, Val, Line, St) ->
-    St#expand{attributes=St#expand.attributes ++ [{Name,Line,[Val]}]}.
-
-function(L, N, A, Cs0, St0) ->
-    {Cs,St} = clauses(Cs0, St0#expand{func=N,arity=A,fcount=0}),
-    {{function,L,N,A,Cs},St}.
-
-%% clauses([Clause], State) ->
-%%      {[TransformedClause],State}.
-%%  Expand function clauses.
-
-clauses([{clause,Line,H0,G0,B0}|Cs0], St0) ->
-    {H,St1} = head(H0, St0),
-    {G,St2} = guard(G0, St1),
-    {B,St3} = exprs(B0, St2),
-    {Cs,St4} = clauses(Cs0, St3),
-    {[{clause,Line,H,G,B}|Cs],St4};
-clauses([], St) -> {[],St}.
-
-%% head(HeadPatterns, State) ->
-%%      {TransformedPatterns,Variables,UsedVariables,State'}
-
-head(As, St) -> pattern_list(As, St).
-
-%% pattern(Pattern, State) ->
-%%      {TransformedPattern,State'}
-%%
-
-pattern({var,_,_}=Var, St) ->
-    {Var,St};
-pattern({char,_,_}=Char, St) ->
-    {Char,St};
-pattern({integer,_,_}=Int, St) ->
-    {Int,St};
-pattern({float,_,_}=Float, St) ->
-    {Float,St};
-pattern({atom,_,_}=Atom, St) ->
-    {Atom,St};
-pattern({string,_,_}=String, St) ->
-    {String,St};
-pattern({nil,_}=Nil, St) ->
-    {Nil,St};
-pattern({cons,Line,H,T}, St0) ->
-    {TH,St1} = pattern(H, St0),
-    {TT,St2} = pattern(T, St1),
-    {{cons,Line,TH,TT},St2};
-pattern({tuple,Line,Ps}, St0) ->
-    {TPs,St1} = pattern_list(Ps, St0),
-    {{tuple,Line,TPs},St1};
-pattern({map,Line,Ps}, St0) ->
-    {TPs,St1} = pattern_list(Ps, St0),
-    {{map,Line,TPs},St1};
-pattern({map_field_exact,Line,K0,V0}, St0) ->
-    %% Key should be treated as an expression
-    %% but since expressions are not allowed yet,
-    %% process it through pattern .. and handle assoc
-    %% (normalise unary op integer -> integer)
-    {K,St1} = pattern(K0, St0),
-    {V,St2} = pattern(V0, St1),
-    {{map_field_exact,Line,K,V},St2};
-pattern({map_field_assoc,Line,K0,V0}, St0) ->
-    %% when keys are Maps
-    {K,St1} = pattern(K0, St0),
-    {V,St2} = pattern(V0, St1),
-    {{map_field_assoc,Line,K,V},St2};
-%%pattern({struct,Line,Tag,Ps}, St0) ->
-%%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
-%%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
-pattern({bin,Line,Es0}, St0) ->
-    {Es1,St1} = pattern_bin(Es0, St0),
-    {{bin,Line,Es1},St1};
-pattern({op,_,'++',{nil,_},R}, St) ->
-    pattern(R, St);
-pattern({op,_,'++',{cons,Li,H,T},R}, St) ->
-    pattern({cons,Li,H,{op,Li,'++',T,R}}, St);
-pattern({op,_,'++',{string,Li,L},R}, St) ->
-    pattern(string_to_conses(Li, L, R), St);
-pattern({match,Line,Pat1, Pat2}, St0) ->
-    {TH,St1} = pattern(Pat2, St0),
-    {TT,St2} = pattern(Pat1, St1),
-    {{match,Line,TT,TH},St2};
-%% Compile-time pattern expressions, including unary operators.
-pattern({op,_Line,_Op,_A}=Op, St) ->
-    {erl_eval:partial_eval(Op),St};
-pattern({op,_Line,_Op,_L,_R}=Op, St) ->
-    {erl_eval:partial_eval(Op),St}.
-
-pattern_list([P0|Ps0], St0) ->
-    {P,St1} = pattern(P0, St0),
-    {Ps,St2} = pattern_list(Ps0, St1),
-    {[P|Ps],St2};
-pattern_list([], St) -> {[],St}.
-
-%% guard(Guard, State) ->
-%%      {TransformedGuard,State'}
-%%  Transform a list of guard tests. We KNOW that this has been checked
-%%  and what the guards test are. Use expr for transforming the guard
-%%  expressions.
-
-guard([G0|Gs0], St0) ->
-    {G,St1} = guard_tests(G0, St0),
-    {Gs,St2} = guard(Gs0, St1),
-    {[G|Gs],St2};
-guard([], St) -> {[],St}.
-
-guard_tests([Gt0|Gts0], St0) ->
-    {Gt1,St1} = guard_test(Gt0, St0),
-    {Gts1,St2} = guard_tests(Gts0, St1),
-    {[Gt1|Gts1],St2};
-guard_tests([], St) -> {[],St}.
-
-guard_test(Test, St) ->
-    expr(Test, St).
-
-%% exprs(Expressions, State) ->
-%%      {TransformedExprs,State'}
-
-exprs([E0|Es0], St0) ->
-    {E,St1} = expr(E0, St0),
-    {Es,St2} = exprs(Es0, St1),
-    {[E|Es],St2};
-exprs([], St) -> {[],St}.
-
-%% expr(Expression, State) ->
-%%      {TransformedExpression,State'}
-
-expr({var,_,_}=Var, St) ->
-    {Var,St};
-expr({char,_,_}=Char, St) ->
-    {Char,St};
-expr({integer,_,_}=Int, St) ->
-    {Int,St};
-expr({float,_,_}=Float, St) ->
-    {Float,St};
-expr({atom,_,_}=Atom, St) ->
-    {Atom,St};
-expr({string,_,_}=String, St) ->
-    {String,St};
-expr({nil,_}=Nil, St) ->
-    {Nil,St};
-expr({cons,Line,H0,T0}, St0) ->
-    {H,St1} = expr(H0, St0),
-    {T,St2} = expr(T0, St1),
-    {{cons,Line,H,T},St2};
-expr({lc,Line,E0,Qs0}, St0) ->
-    {Qs1,St1} = lc_tq(Line, Qs0, St0),
-    {E1,St2} = expr(E0, St1),
-    {{lc,Line,E1,Qs1},St2};
-expr({bc,Line,E0,Qs0}, St0) ->
-    {Qs1,St1} = lc_tq(Line, Qs0, St0),
-    {E1,St2} = expr(E0, St1),
-    {{bc,Line,E1,Qs1},St2};
-expr({tuple,Line,Es0}, St0) ->
-    {Es1,St1} = expr_list(Es0, St0),
-    {{tuple,Line,Es1},St1};
-%%expr({struct,Line,Tag,Es0}, Vs, St0) ->
-%%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
-%%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
-expr({map,Line,Es0}, St0) ->
-    {Es1,St1} = expr_list(Es0, St0),
-    {{map,Line,Es1},St1};
-expr({map,Line,E0,Es0}, St0) ->
-    {E1,St1} = expr(E0, St0),
-    {Es1,St2} = expr_list(Es0, St1),
-    {{map,Line,E1,Es1},St2};
-expr({map_field_assoc,Line,K0,V0}, St0) ->
-    {K,St1} = expr(K0, St0),
-    {V,St2} = expr(V0, St1),
-    {{map_field_assoc,Line,K,V},St2};
-expr({map_field_exact,Line,K0,V0}, St0) ->
-    {K,St1} = expr(K0, St0),
-    {V,St2} = expr(V0, St1),
-    {{map_field_exact,Line,K,V},St2};
-expr({bin,Line,Es0}, St0) ->
-    {Es1,St1} = expr_bin(Es0, St0),
-    {{bin,Line,Es1},St1};
-expr({block,Line,Es0}, St0) ->
-    {Es,St1} = exprs(Es0, St0),
-    {{block,Line,Es},St1};
-expr({'if',Line,Cs0}, St0) ->
-    {Cs,St1} = clauses(Cs0, St0),
-    {{'if',Line,Cs},St1};
-expr({'case',Line,E0,Cs0}, St0) ->
-    {E,St1} = expr(E0, St0),
-    {Cs,St2} = clauses(Cs0, St1),
-    {{'case',Line,E,Cs},St2};
-expr({'receive',Line,Cs0}, St0) ->
-    {Cs,St1} = clauses(Cs0, St0),
-    {{'receive',Line,Cs},St1};
-expr({'receive',Line,Cs0,To0,ToEs0}, St0) ->
-    {To,St1} = expr(To0, St0),
-    {ToEs,St2} = exprs(ToEs0, St1),
-    {Cs,St3} = clauses(Cs0, St2),
-    {{'receive',Line,Cs,To,ToEs},St3};
-expr({'fun',Line,Body}, St) ->
-    fun_tq(Line, Body, St);
-expr({named_fun,Line,Name,Cs}, St) ->
-    fun_tq(Line, Cs, St, Name);
-expr({call,Line,{atom,La,N}=Atom,As0}, St0) ->
-    {As,St1} = expr_list(As0, St0),
-    Ar = length(As),
-    Key = {N,Ar},
-    case St1#expand.ctype of
-	#{Key:=local} ->
-	    {{call,Line,Atom,As},St1};
-	#{Key:={imported,Mod}} ->
-	    {{call,Line,{remote,La,{atom,La,Mod},Atom},As},St1};
-	_ ->
-	    true = erl_internal:bif(N, Ar),
-	    {{call,Line,{remote,La,{atom,La,erlang},Atom},As},St1}
-    end;
-expr({call,Line,{remote,Lr,M0,F},As0}, St0) ->
-    {[M1,F1|As1],St1} = expr_list([M0,F|As0], St0),
-    {{call,Line,{remote,Lr,M1,F1},As1},St1};
-expr({call,Line,F,As0}, St0) ->
-    {[Fun1|As1],St1} = expr_list([F|As0], St0),
-    {{call,Line,Fun1,As1},St1};
-expr({'try',Line,Es0,Scs0,Ccs0,As0}, St0) ->
-    {Es1,St1} = exprs(Es0, St0),
-    {Scs1,St2} = clauses(Scs0, St1),
-    {Ccs1,St3} = clauses(Ccs0, St2),
-    {As1,St4} = exprs(As0, St3),
-    {{'try',Line,Es1,Scs1,Ccs1,As1},St4};
-expr({'catch',Line,E0}, St0) ->
-    {E,St1} = expr(E0, St0),
-    {{'catch',Line,E},St1};
-expr({match,Line,P0,E0}, St0) ->
-    {E,St1} = expr(E0, St0),
-    {P,St2} = pattern(P0, St1),
-    {{match,Line,P,E},St2};
-expr({op,Line,Op,A0}, St0) ->
-    {A,St1} = expr(A0, St0),
-    {{op,Line,Op,A},St1};
-expr({op,Line,Op,L0,R0}, St0) ->
-    {L,St1} = expr(L0, St0),
-    {R,St2} = expr(R0, St1),
-    {{op,Line,Op,L,R},St2}.
-
-expr_list([E0|Es0], St0) ->
-    {E,St1} = expr(E0, St0),
-    {Es,St2} = expr_list(Es0, St1),
-    {[E|Es],St2};
-expr_list([], St) -> {[],St}.
-
-%% lc_tq(Line, Qualifiers, State) ->
-%%      {[TransQual],State'}
-
-lc_tq(Line, [{generate,Lg,P0,G0} | Qs0], St0) ->
-    {G1,St1} = expr(G0, St0),
-    {P1,St2} = pattern(P0, St1),
-    {Qs1,St3} = lc_tq(Line, Qs0, St2),
-    {[{generate,Lg,P1,G1} | Qs1],St3};
-
-lc_tq(Line, [{b_generate,Lg,P0,G0}|Qs0], St0) ->
-    {G1,St1} = expr(G0, St0),
-    {P1,St2} = pattern(P0, St1),
-    {Qs1,St3} = lc_tq(Line, Qs0, St2),
-    {[{b_generate,Lg,P1,G1}|Qs1],St3};
-lc_tq(Line, [F0 | Qs0], St0) ->
-    {F1,St1} = expr(F0, St0),
-    {Qs1,St2} = lc_tq(Line, Qs0, St1),
-    {[F1|Qs1],St2};
-lc_tq(_Line, [], St0) ->
-    {[],St0}.
-
-
-%% fun_tq(Line, Body, State) ->
-%%      {Fun,State'}
-%% Transform an "explicit" fun {'fun', Line, {clauses, Cs}} into an
-%% extended form {'fun', Line, {clauses, Cs}, Info}, unless it is the
-%% name of a BIF (erl_lint has checked that it is not an import).
-%% "Implicit" funs {'fun', Line, {function, F, A}} are not changed.
-
-fun_tq(Lf, {function,F,A}=Function, St0) ->
-    case erl_internal:bif(F, A) of
-        true ->
-	    {As,St1} = new_vars(A, Lf, St0),
-	    Cs = [{clause,Lf,As,[],[{call,Lf,{atom,Lf,F},As}]}],
-            fun_tq(Lf, {clauses,Cs}, St1);
-        false ->
-            {Fname,St1} = new_fun_name(St0),
-            Index = Uniq = 0,
-            {{'fun',Lf,Function,{Index,Uniq,Fname}},St1}
-    end;
-fun_tq(L, {function,M,F,A}, St) when is_atom(M), is_atom(F), is_integer(A) ->
-    %% This is the old format for external funs, generated by a pre-R15
-    %% compiler. That means that a tool, such as the debugger or xref,
-    %% directly invoked this module with the abstract code from a
-    %% pre-R15 BEAM file. Be helpful, and translate it to the new format.
-    fun_tq(L, {function,{atom,L,M},{atom,L,F},{integer,L,A}}, St);
-fun_tq(Lf, {function,_,_,_}=ExtFun, St) ->
-    {{'fun',Lf,ExtFun},St};
-fun_tq(Lf, {clauses,Cs0}, St0) ->
-    {Cs1,St1} = clauses(Cs0, St0),
-    {Fname,St2} = new_fun_name(St1),
-    %% Set dummy values for Index and Uniq -- the real values will
-    %% be assigned by beam_asm.
-    Index = Uniq = 0,
-    {{'fun',Lf,{clauses,Cs1},{Index,Uniq,Fname}},St2}.
-
-fun_tq(Line, Cs0, St0, Name) ->
-    {Cs1,St1} = clauses(Cs0, St0),
-    {Fname,St2} = new_fun_name(St1, Name),
-    {{named_fun,Line,Name,Cs1,{0,0,Fname}},St2}.
-
-%% new_fun_name(State) -> {FunName,State}.
-
-new_fun_name(St) ->
-    new_fun_name(St, 'fun').
-
-new_fun_name(#expand{func=F,arity=A,fcount=I}=St, FName) ->
-    Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A)
-        ++ "-" ++ atom_to_list(FName) ++ "-" ++ integer_to_list(I) ++ "-",
-    {list_to_atom(Name),St#expand{fcount=I+1}}.
-
-%% pattern_bin([Element], State) -> {[Element],[Variable],[UsedVar],State}.
-
-pattern_bin(Es0, St) ->
-    Es1 = bin_expand_strings(Es0),
-    foldr(fun (E, Acc) -> pattern_element(E, Acc) end, {[],St}, Es1).
-
-pattern_element({bin_element,Line,Expr0,Size0,Type0}, {Es,St0}) ->
-    {Expr1,St1} = pattern(Expr0, St0),
-    {Size1,St2} = pat_bit_size(Size0, St1),
-    {Size,Type} = make_bit_type(Line, Size1, Type0),
-    Expr = coerce_to_float(Expr1, Type0),
-    {[{bin_element,Line,Expr,Size,Type}|Es],St2}.
-
-pat_bit_size(default, St) -> {default,St};
-pat_bit_size({var,_Lv,_V}=Var, St) -> {Var,St};
-pat_bit_size(Size, St) ->
-    Line = element(2, Size),
-    {value,Sz,_} = erl_eval:expr(Size, erl_eval:new_bindings()),
-    {{integer,Line,Sz},St}.
-
-make_bit_type(Line, default, Type0) ->
-    case erl_bits:set_bit_type(default, Type0) of
-        {ok,all,Bt} -> {{atom,Line,all},erl_bits:as_list(Bt)};
-	{ok,undefined,Bt} -> {{atom,Line,undefined},erl_bits:as_list(Bt)};
-        {ok,Size,Bt} -> {{integer,Line,Size},erl_bits:as_list(Bt)}
-    end;
-make_bit_type(_Line, Size, Type0) ->            %Integer or 'all'
-    {ok,Size,Bt} = erl_bits:set_bit_type(Size, Type0),
-    {Size,erl_bits:as_list(Bt)}.
-
-coerce_to_float({integer,L,I}=E, [float|_]) ->
-    try
-        {float,L,float(I)}
-    catch
-        error:badarg -> E
-    end;
-coerce_to_float(E, _) -> E.
-    
-%% expr_bin([Element], State) -> {[Element],State}.
-
-expr_bin(Es0, St) ->
-    Es1 = bin_expand_strings(Es0),
-    foldr(fun (E, Acc) -> bin_element(E, Acc) end, {[],St}, Es1).
-
-bin_element({bin_element,Line,Expr,Size,Type}, {Es,St0}) ->
-    {Expr1,St1} = expr(Expr, St0),
-    {Size1,St2} = if Size == default -> {default,St1};
-                             true -> expr(Size, St1)
-                          end,
-    {Size2,Type1} = make_bit_type(Line, Size1, Type),
-    {[{bin_element,Line,Expr1,Size2,Type1}|Es],St2}.
-
-bin_expand_strings(Es) ->
-    foldr(fun ({bin_element,Line,{string,_,S},Sz,Ts}, Es1) ->
-                  foldr(fun (C, Es2) ->
-                                [{bin_element,Line,{char,Line,C},Sz,Ts}|Es2]
-                        end, Es1, S);
-              (E, Es1) -> [E|Es1]
-          end, [], Es).
-
-%% new_var_name(State) -> {VarName,State}.
-
-new_var_name(St) ->
-    C = St#expand.vcount,
-    {list_to_atom("pre" ++ integer_to_list(C)),St#expand{vcount=C+1}}.
-
-%% new_var(Line, State) -> {Var,State}.
-
-new_var(L, St0) ->
-    {New,St1} = new_var_name(St0),
-    {{var,L,New},St1}.
-
-%% new_vars(Count, Line, State) -> {[Var],State}.
-%%  Make Count new variables.
-
-new_vars(N, L, St) -> new_vars(N, L, St, []).
-
-new_vars(N, L, St0, Vs) when N > 0 ->
-    {V,St1} = new_var(L, St0),
-    new_vars(N-1, L, St1, [V|Vs]);
-new_vars(0, _L, St, Vs) -> {Vs,St}.
-
-string_to_conses(Line, Cs, Tail) ->
-    foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
-
-
-%% import(Line, Imports, State) ->
-%%      State'
-%%  Handle import declarations.
-
-import({Mod,Fs}, #expand{ctype=Ctype0}=St) ->
-    true = is_atom(Mod),
-    Ctype = foldl(fun(F, A) ->
-			  A#{F=>{imported,Mod}}
-		  end, Ctype0, Fs),
-    St#expand{ctype=Ctype}.
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 4df1aadd0a..c2e0c2bd1a 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -151,6 +151,8 @@ cg({bif,Bif,As,Rs}, Le, Vdb, Bef, St) ->
     bif_cg(Bif, As, Rs, Le, Vdb, Bef, St);
 cg({gc_bif,Bif,As,Rs}, Le, Vdb, Bef, St) ->
     gc_bif_cg(Bif, As, Rs, Le, Vdb, Bef, St);
+cg({internal,Bif,As,Rs}, Le, Vdb, Bef, St) ->
+    internal_cg(Bif, As, Rs, Le, Vdb, Bef, St);
 cg({receive_loop,Te,Rvar,Rm,Tes,Rs}, Le, Vdb, Bef, St) ->
     recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St);
 cg(receive_next, Le, Vdb, Bef, St) ->
@@ -208,15 +210,10 @@ need_heap_1(#l{ke={set,_,Val}}, H) ->
 		{tuple,Es} -> 1 + length(Es);
 		_Other -> 0
 	    end};
-need_heap_1(#l{ke={bif,dsetelement,_As,_Rs},i=I}, H) ->
-    {need_heap_need(I, H),0};
-need_heap_1(#l{ke={bif,{make_fun,_,_,_,_},_As,_Rs},i=I}, H) ->
-    {need_heap_need(I, H),0};
-need_heap_1(#l{ke={bif,bs_init_writable,_As,_Rs},i=I}, H) ->
-    {need_heap_need(I, H),0};
 need_heap_1(#l{ke={bif,_Bif,_As,_Rs}}, H) ->
     {[],H};
 need_heap_1(#l{i=I}, H) ->
+    %% Call or call-like instruction such as set_tuple_element/3.
     {need_heap_need(I, H),0}.
 
 need_heap_need(_I, 0) -> [];
@@ -1301,10 +1298,10 @@ trap_bif(erlang, group_leader, 2) -> true;
 trap_bif(erlang, exit, 2) -> true;
 trap_bif(_, _, _) -> false.
 
-%% bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
+%% internal_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
 
-bif_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) ->
+internal_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) ->
     [Src] = cg_reg_args([Src0], Bef),
     case is_register(Src) of
 	false ->
@@ -1312,25 +1309,34 @@ bif_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) ->
 	true ->
 	    {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0}
     end;
-bif_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
+internal_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
     [New,Tuple,{integer,Index1}] = cg_reg_args([New0,Tuple0,Index0], Bef),
     Index = Index1-1,
     {[{set_tuple_element,New,Tuple,Index}],
      clear_dead(Bef, Le#l.i, Vdb), St0};
-bif_cg({make_fun,Func,Arity,Index,Uniq}, As, Rs, Le, Vdb, Bef, St0) ->
+internal_cg(make_fun, [Func0,Arity0|As], Rs, Le, Vdb, Bef, St0) ->
     %% This behaves more like a function call.
+    {atom,Func} = Func0,
+    {integer,Arity} = Arity0,
     {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
     {FuncLbl,St1} = local_func_label(Func, Arity, St0),
-    MakeFun = {make_fun2,{f,FuncLbl},Index,Uniq,length(As)},
+    MakeFun = {make_fun2,{f,FuncLbl},0,0,length(As)},
     {Sis ++ [MakeFun],
      clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),
      St1};
-bif_cg(bs_init_writable=I, As, Rs, Le, Vdb, Bef, St) ->
+internal_cg(bs_init_writable=I, As, Rs, Le, Vdb, Bef, St) ->
     %% This behaves like a function call.
     {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
     {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St};
+internal_cg(raise, As, Rs, Le, Vdb, Bef, St) ->
+    %% raise can be treated like a guard BIF.
+    bif_cg(raise, As, Rs, Le, Vdb, Bef, St).
+
+%% bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
+%%      {[Ainstr],StackReg,State}.
+
 bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
     Ars = cg_reg_args(As, Bef),
 
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index d71411de80..f40cf97f57 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -137,11 +137,13 @@
 
 -record(core, {vcount=0 :: non_neg_integer(),	%Variable counter
 	       fcount=0 :: non_neg_integer(),	%Function counter
+	       function={none,0} :: fa(),	%Current function.
 	       in_guard=false :: boolean(),	%In guard or not.
 	       wanted=true :: boolean(),	%Result wanted or not.
 	       opts     :: [compile:option()],	%Options.
 	       ws=[]    :: [warning()],		%Warnings.
-               file=[{file,""}]}).              %File
+               file=[{file,""}]			%File.
+	      }).
 
 %% XXX: The following type declarations do not belong in this module
 -type fa()        :: {atom(), arity()}.
@@ -149,38 +151,77 @@
 -type form()      :: {function, integer(), atom(), arity(), _}
                    | {attribute, integer(), attribute(), _}.
 
--spec module({module(), [fa()], [form()]}, [compile:option()]) ->
+-record(imodule, {name = [],
+		  exports = ordsets:new(),
+		  attrs = [],
+		  defs = [],
+		  file = [],
+		  opts = [],
+		  ws = []}).
+
+-spec module([form()], [compile:option()]) ->
         {'ok',cerl:c_module(),[warning()]}.
 
-module({Mod,Exp,Forms}, Opts) ->
-    Cexp = map(fun ({_N,_A} = NA) -> #c_var{name=NA} end, Exp),
-    {Kfs0,As0,Ws,_File} = foldl(fun (F, Acc) ->
-					form(F, Acc, Opts)
-				end, {[],[],[],[]}, Forms),
-    Kfs = reverse(Kfs0),
+module(Forms0, Opts) ->
+    Forms = erl_internal:add_predefined_functions(Forms0),
+    Module = foldl(fun (F, Acc) ->
+			   form(F, Acc, Opts)
+		   end, #imodule{}, Forms),
+    #imodule{name=Mod,exports=Exp0,attrs=As0,defs=Kfs0,ws=Ws} = Module,
+    Exp = case member(export_all, Opts) of
+	      true -> defined_functions(Forms);
+	      false -> Exp0
+	  end,
+    Cexp = [#c_var{name=FA} || {_,_}=FA <- Exp],
     As = reverse(As0),
+    Kfs = reverse(Kfs0),
     {ok,#c_module{name=#c_literal{val=Mod},exports=Cexp,attrs=As,defs=Kfs},Ws}.
 
-form({function,_,_,_,_}=F0, {Fs,As,Ws0,File}, Opts) ->
+form({function,_,_,_,_}=F0, Module, Opts) ->
+    #imodule{file=File,defs=Defs,ws=Ws0} = Module,
     {F,Ws} = function(F0, Ws0, File, Opts),
-    {[F|Fs],As,Ws,File};
-form({attribute,_,file,{File,_Line}}, {Fs,As,Ws,_}, _Opts) ->
-    {Fs,As,Ws,File};
-form({attribute,_,_,_}=F, {Fs,As,Ws,File}, _Opts) ->
-    {Fs,[attribute(F)|As],Ws,File}.
+    Module#imodule{defs=[F|Defs],ws=Ws};
+form({attribute,_,module,Mod}, Module, _Opts) ->
+    true = is_atom(Mod),
+    Module#imodule{name=Mod};
+form({attribute,_,file,{File,_Line}}, Module, _Opts) ->
+    Module#imodule{file=File};
+form({attribute,_,compile,_}, Module, _Opts) ->
+    %% Ignore compilation options.
+    Module;
+form({attribute,_,import,_}, Module, _Opts) ->
+    %% Ignore. We have no futher use for imports.
+    Module;
+form({attribute,_,export,Es}, #imodule{exports=Exp0}=Module, _Opts) ->
+    Exp = ordsets:union(ordsets:from_list(Es), Exp0),
+    Module#imodule{exports=Exp};
+form({attribute,_,_,_}=F, #imodule{attrs=As}=Module, _Opts) ->
+    Module#imodule{attrs=[attribute(F)|As]};
+form(_, Module, _Opts) ->
+    %% Ignore uninteresting forms such as 'eof'.
+    Module.
 
 attribute(Attribute) ->
     Fun = fun(A) ->  [erl_anno:location(A)] end,
-    {attribute,Line,Name,Val} = erl_parse:map_anno(Fun, Attribute),
+    {attribute,Line,Name,Val0} = erl_parse:map_anno(Fun, Attribute),
+    Val = if
+	      is_list(Val0) -> Val0;
+	      true -> [Val0]
+	  end,
     {#c_literal{val=Name, anno=Line}, #c_literal{val=Val, anno=Line}}.
 
+defined_functions(Forms) ->
+    Fs = [{Name,Arity} || {function,_,Name,Arity,_} <- Forms],
+    ordsets:from_list(Fs).
+
 %% function_dump(module_info,_,_,_) -> ok;
 %% function_dump(Name,Arity,Format,Terms) ->
 %%     io:format("~w/~w " ++ Format,[Name,Arity]++Terms),
 %%     ok.
 
 function({function,_,Name,Arity,Cs0}, Ws0, File, Opts) ->
-    St0 = #core{vcount=0,opts=Opts,ws=Ws0,file=[{file,File}]},
+    St0 = #core{vcount=0,function={Name,Arity},opts=Opts,
+		ws=Ws0,file=[{file,File}]},
     {B0,St1} = body(Cs0, Name, Arity, St0),
     %% ok = function_dump(Name,Arity,"body:~n~p~n",[B0]),
     {B1,St2} = ubody(B0, St1),
@@ -632,9 +673,11 @@ expr({'catch',L,E0}, St0) ->
     {E1,Eps,St1} = expr(E0, St0),
     Lanno = lineno_anno(L, St1),
     {#icatch{anno=#a{anno=Lanno},body=Eps ++ [E1]},[],St1};
-expr({'fun',L,{function,F,A},{_,_,_}=Id}, St) ->
-    Lanno = full_anno(L, St),
-    {#c_var{anno=Lanno++[{id,Id}],name={F,A}},[],St};
+expr({'fun',L,{function,F,A}}, St0) ->
+    {Fname,St1} = new_fun_name(St0),
+    Lanno = full_anno(L, St1),
+    Id = {0,0,Fname},
+    {#c_var{anno=Lanno++[{id,Id}],name={F,A}},[],St1};
 expr({'fun',L,{function,M,F,A}}, St0) ->
     {As,Aps,St1} = safe_list([M,F,A], St0),
     Lanno = full_anno(L, St1),
@@ -642,12 +685,12 @@ expr({'fun',L,{function,M,F,A}}, St0) ->
 	    module=#c_literal{val=erlang},
 	    name=#c_literal{val=make_fun},
 	    args=As},Aps,St1};
-expr({'fun',L,{clauses,Cs},Id}, St) ->
-    fun_tq(Id, Cs, L, St, unnamed);
-expr({named_fun,L,'_',Cs,Id}, St) ->
-    fun_tq(Id, Cs, L, St, unnamed);
-expr({named_fun,L,Name,Cs,Id}, St) ->
-    fun_tq(Id, Cs, L, St, {named,Name});
+expr({'fun',L,{clauses,Cs}}, St) ->
+    fun_tq(Cs, L, St, unnamed);
+expr({named_fun,L,'_',Cs}, St) ->
+    fun_tq(Cs, L, St, unnamed);
+expr({named_fun,L,Name,Cs}, St) ->
+    fun_tq(Cs, L, St, {named,Name});
 expr({call,L,{remote,_,M,F},As0}, St0) ->
     {[M1,F1|As1],Aps,St1} = safe_list([M,F|As0], St0),
     Anno = full_anno(L, St1),
@@ -899,14 +942,29 @@ try_after(As, St0) ->
 %%  record whereas c_literal should not have a wrapped annotation
  
 expr_bin(Es0, Anno, St0) ->
-    case constant_bin(Es0) of
+    Es1 = [bin_element(E) || E <- Es0],
+    case constant_bin(Es1) of
 	error ->
-	    {Es,Eps,St} = expr_bin_1(Es0, St0),
+	    {Es,Eps,St} = expr_bin_1(bin_expand_strings(Es1), St0),
 	    {#ibinary{anno=#a{anno=Anno},segments=Es},Eps,St};
 	Bin ->
 	    {#c_literal{anno=Anno,val=Bin},[],St0}
     end.
 
+bin_element({bin_element,Line,Expr,Size0,Type0}) ->
+    {Size,Type} = make_bit_type(Line, Size0, Type0),
+    {bin_element,Line,Expr,Size,Type}.
+
+make_bit_type(Line, default, Type0) ->
+    case erl_bits:set_bit_type(default, Type0) of
+        {ok,all,Bt} -> {{atom,Line,all},erl_bits:as_list(Bt)};
+	{ok,undefined,Bt} -> {{atom,Line,undefined},erl_bits:as_list(Bt)};
+        {ok,Size,Bt} -> {{integer,Line,Size},erl_bits:as_list(Bt)}
+    end;
+make_bit_type(_Line, Size, Type0) ->            %Integer or 'all'
+    {ok,Size,Bt} = erl_bits:set_bit_type(Size, Type0),
+    {Size,erl_bits:as_list(Bt)}.
+
 %% constant_bin([{bin_element,_,_,_,_}]) -> binary() | error
 %%  If the binary construction is truly constant (no variables,
 %%  no native fields), and does not contain fields whose expansion
@@ -923,7 +981,8 @@ constant_bin(Es) ->
 constant_bin_1(Es) ->
     verify_suitable_fields(Es),
     EmptyBindings = erl_eval:new_bindings(),
-    EvalFun = fun({integer,_,I}, B) -> {value,I,B};
+    EvalFun = fun({string,_,S}, B) -> {value,S,B};
+		 ({integer,_,I}, B) -> {value,I,B};
 		 ({char,_,C}, B) -> {value,C,B};
 		 ({float,_,F}, B) -> {value,F,B};
 		 ({atom,_,undefined}, B) -> {value,undefined,B}
@@ -944,6 +1003,9 @@ verify_suitable_fields([{bin_element,_,Val,SzTerm,Opts}|Es]) ->
     end,
     {unit,Unit} = keyfind(unit, 1, Opts),
     case {SzTerm,Val} of
+	{{atom,_,undefined},{string,_,_}} ->
+	    %% UTF-8/16/32.
+	    ok;
 	{{atom,_,undefined},{char,_,_}} ->
 	    %% UTF-8/16/32.
 	    ok;
@@ -983,6 +1045,14 @@ count_bits(Int) ->
 count_bits_1(0, Bits) -> Bits;
 count_bits_1(Int, Bits) -> count_bits_1(Int bsr 64, Bits+64).
 
+bin_expand_strings(Es) ->
+    foldr(fun ({bin_element,Line,{string,_,S},Sz,Ts}, Es1) ->
+		  foldr(fun (C, Es2) ->
+				[{bin_element,Line,{char,Line,C},Sz,Ts}|Es2]
+			end, Es1, S);
+	      (E, Es1) -> [E|Es1]
+	  end, [], Es).
+
 expr_bin_1(Es, St) ->
     foldr(fun (E, {Ces,Esp,St0}) ->
 		  {Ce,Ep,St1} = bitstr(E, St0),
@@ -1018,17 +1088,19 @@ bitstr({bin_element,_,E0,Size0,[Type,{unit,Unit}|Flags]}, St0) ->
 
 %% fun_tq(Id, [Clauses], Line, State, NameInfo) -> {Fun,[PreExp],State}.
 
-fun_tq({_,_,Name}=Id, Cs0, L, St0, NameInfo) ->
+fun_tq(Cs0, L, St0, NameInfo) ->
     Arity = clause_arity(hd(Cs0)),
     {Cs1,Ceps,St1} = clauses(Cs0, St0),
     {Args,St2} = new_vars(Arity, St1),
     {Ps,St3} = new_vars(Arity, St2),		%Need new variables here
     Anno = full_anno(L, St3),
+    {Name,St4} = new_fun_name(St3),
     Fc = function_clause(Ps, Anno, {Name,Arity}),
+    Id = {0,0,Name},
     Fun = #ifun{anno=#a{anno=Anno},
 		id=[{id,Id}],				%We KNOW!
 		vars=Args,clauses=Cs1,fc=Fc,name=NameInfo},
-    {Fun,Ceps,St3}.
+    {Fun,Ceps,St4}.
 
 %% lc_tq(Line, Exp, [Qualifier], Mc, State) -> {LetRec,[PreExp],State}.
 %%  This TQ from Simon PJ pp 127-138.  
@@ -1354,8 +1426,9 @@ list_gen_pattern(P0, Line, St) ->
 %%% the result binary in a binary comprehension.
 %%%
 
-bc_initial_size(E, Q, St0) ->
+bc_initial_size(E0, Q, St0) ->
     try
+	E = bin_bin_element(E0),
 	{ElemSzExpr,ElemSzPre,EVs,St1} = bc_elem_size(E, St0),
 	{V,St2} = new_var(St1),
 	{GenSzExpr,GenSzPre,St3} = bc_gen_size(Q, EVs, St2),
@@ -1394,11 +1467,15 @@ bc_elem_size({bin,_,El}, St0) ->
 bc_elem_size(_, _) ->
     throw(impossible).
 
-bc_elem_size_1([{bin_element,_,_,{integer,_,N},Flags}|Es], Bits, Vars) ->
-    {unit,U} = keyfind(unit, 1, Flags),
+bc_elem_size_1([{bin_element,_,{string,_,String},{integer,_,N},_}=El|Es],
+	       Bits, Vars) ->
+    U = get_unit(El),
+    bc_elem_size_1(Es, Bits+U*N*length(String), Vars);
+bc_elem_size_1([{bin_element,_,_,{integer,_,N},_}=El|Es], Bits, Vars) ->
+    U = get_unit(El),
     bc_elem_size_1(Es, Bits+U*N, Vars);
-bc_elem_size_1([{bin_element,_,_,{var,_,Var},Flags}|Es], Bits, Vars) ->
-    {unit,U} = keyfind(unit, 1, Flags),
+bc_elem_size_1([{bin_element,_,_,{var,_,Var},_}=El|Es], Bits, Vars) ->
+    U = get_unit(El),
     bc_elem_size_1(Es, Bits, [{U,#c_var{name=Var}}|Vars]);
 bc_elem_size_1([_|_], _, _) ->
     throw(impossible);
@@ -1455,7 +1532,9 @@ bc_gen_size_1([{generate,L,El,Gen}|Qs], EVs, E0, Pre0, St0) ->
 	    {E,Pre,St} = bc_gen_size_mul(E0, #c_literal{val=Len}, Pre0, St0),
 	    bc_gen_size_1(Qs, EVs, E, Pre, St)
     end;
-bc_gen_size_1([{b_generate,_,El,Gen}|Qs], EVs, E0, Pre0, St0) ->
+bc_gen_size_1([{b_generate,_,El0,Gen0}|Qs], EVs, E0, Pre0, St0) ->
+    El = bin_bin_element(El0),
+    Gen = bin_bin_element(Gen0),
     bc_verify_non_filtering(El, EVs),
     {MatchSzExpr,Pre1,_,St1} = bc_elem_size(El, St0),
     Pre2 = reverse(Pre1, Pre0),
@@ -1471,6 +1550,10 @@ bc_gen_size_1([], _, E, Pre, St) ->
 bc_gen_size_1(_, _, _, _, _) ->
     throw(impossible).
 
+bin_bin_element({bin,L,El}) ->
+    {bin,L,[bin_element(E) || E <- El]};
+bin_bin_element(Other) -> Other.
+
 bc_gen_bit_size({var,L,V}, Pre0, St0) ->
     Lanno = lineno_anno(L, St0),
     {SzVar,St} = new_var(St0),
@@ -1513,8 +1596,11 @@ bc_list_length(_, _) ->
 bc_bin_size({bin,_,Els}) ->
     bc_bin_size_1(Els, 0).
 
-bc_bin_size_1([{bin_element,_,_,{integer,_,Sz},Flags}|Els], N) ->
-    {unit,U} = keyfind(unit, 1, Flags),
+bc_bin_size_1([{bin_element,_,{string,_,String},{integer,_,Sz},_}=El|Els], N) ->
+    U = get_unit(El),
+    bc_bin_size_1(Els, N+U*Sz*length(String));
+bc_bin_size_1([{bin_element,_,_,{integer,_,Sz},_}=El|Els], N) ->
+    U = get_unit(El),
     bc_bin_size_1(Els, N+U*Sz);
 bc_bin_size_1([], N) -> N;
 bc_bin_size_1(_, _) -> throw(impossible).
@@ -1549,11 +1635,24 @@ bc_bsr(E1, E2) ->
 	   name=#c_literal{val='bsr'},
 	   args=[E1,E2]}.
 
-%% is_guard_test(Expression) -> true | false.
-%%  Test if a general expression is a guard test.  Use erl_lint here
-%%  as it now allows sys_pre_expand transformed source.
+get_unit({bin_element,_,_,_,Flags}) ->
+    {unit,U} = keyfind(unit, 1, Flags),
+    U.
 
-is_guard_test(E) -> erl_lint:is_guard_test(E).
+%% is_guard_test(Expression) -> true | false.
+%%  Test if a general expression is a guard test.
+%%
+%%  Note that a local function overrides a BIF with the same name.
+%%  For example, if there is a local function named is_list/1,
+%%  any unqualified call to is_list/1 will be to the local function.
+%%  The guard function must be explicitly called as erlang:is_list/1.
+
+is_guard_test(E) ->
+    %% erl_expand_records has added a module prefix to any call
+    %% to a BIF or imported function. Any call without a module
+    %% prefix that remains must therefore be to a local function.
+    IsOverridden = fun({_,_}) -> true end,
+    erl_lint:is_guard_test(E, [], IsOverridden).
 
 %% novars(Expr, State) -> {Novars,[PreExpr],State}.
 %%  Generate a novars expression, basically a call or a safe.  At this
@@ -1696,7 +1795,18 @@ pattern({bin,L,Ps}, St) ->
 pattern({match,_,P1,P2}, St) ->
     {Cp1,Eps1,St1} = pattern(P1,St),
     {Cp2,Eps2,St2} = pattern(P2,St1),
-    {pat_alias(Cp1,Cp2),Eps1++Eps2,St2}.
+    {pat_alias(Cp1,Cp2),Eps1++Eps2,St2};
+%% Evaluate compile-time expressions.
+pattern({op,_,'++',{nil,_},R}, St) ->
+    pattern(R, St);
+pattern({op,_,'++',{cons,Li,H,T},R}, St) ->
+    pattern({cons,Li,H,{op,Li,'++',T,R}}, St);
+pattern({op,_,'++',{string,Li,L},R}, St) ->
+    pattern(string_to_conses(Li, L, R), St);
+pattern({op,_Line,_Op,_A}=Op, St) ->
+    pattern(erl_eval:partial_eval(Op), St);
+pattern({op,_Line,_Op,_L,_R}=Op, St) ->
+    pattern(erl_eval:partial_eval(Op), St).
 
 %% pattern_map_pairs([MapFieldExact],State) -> [#c_map_pairs{}]
 pattern_map_pairs(Ps, St) ->
@@ -1736,18 +1846,29 @@ pat_alias_map_pairs_1([]) -> [].
 
 %% pat_bin([BinElement], State) -> [BinSeg].
 
-pat_bin(Ps, St) -> [pat_segment(P, St) || P <- Ps].
+pat_bin(Ps, St) -> [pat_segment(P, St) || P <- bin_expand_strings(Ps)].
 
-pat_segment({bin_element,L,Val,Size,[Type,{unit,Unit}|Flags]}, St) ->
+pat_segment({bin_element,L,Val,Size0,Type0}, St) ->
+    {Size,Type1} = make_bit_type(L, Size0, Type0),
+    [Type,{unit,Unit}|Flags] = Type1,
     Anno = lineno_anno(L, St),
-    {Pval,[],St1} = pattern(Val,St),
-    {Psize,[],_St2} = pattern(Size,St1),
+    {Pval0,[],St1} = pattern(Val, St),
+    Pval = coerce_to_float(Pval0, Type0),
+    {Psize,[],_St2} = pattern(Size, St1),
     #c_bitstr{anno=Anno,
 	      val=Pval,size=Psize,
 	      unit=#c_literal{val=Unit},
 	      type=#c_literal{val=Type},
 	      flags=#c_literal{val=Flags}}.
 
+coerce_to_float(#c_literal{val=Int}=E, [float|_]) when is_integer(Int) ->
+    try
+	E#c_literal{val=float(Int)}
+    catch
+        error:badarg -> E
+    end;
+coerce_to_float(E, _) -> E.
+
 %% pat_alias(CorePat, CorePat) -> AliasPat.
 %%  Normalise aliases.  Trap bad aliases by throwing 'nomatch'.
 
@@ -1817,11 +1938,18 @@ pattern_list([P0|Ps0], St0) ->
 pattern_list([], St) ->
     {[],[],St}.
 
+string_to_conses(Line, Cs, Tail) ->
+    foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
 
 %% make_vars([Name]) -> [{Var,Name}].
 
 make_vars(Vs) -> [ #c_var{name=V} || V <- Vs ].
 
+new_fun_name(#core{function={F,A},fcount=I}=St) ->
+    Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A)
+        ++ "-fun-" ++ integer_to_list(I) ++ "-",
+    {list_to_atom(Name),St#core{fcount=I+1}}.
+
 %% new_fun_name(Type, State) -> {FunName,State}.
 
 new_fun_name(Type, #core{fcount=C}=St) ->
@@ -1830,7 +1958,7 @@ new_fun_name(Type, #core{fcount=C}=St) ->
 %% new_var_name(State) -> {VarName,State}.
 
 new_var_name(#core{vcount=C}=St) ->
-    {list_to_atom("cor" ++ integer_to_list(C)),St#core{vcount=C + 1}}.
+    {list_to_atom("@c" ++ integer_to_list(C)),St#core{vcount=C + 1}}.
 
 %% new_var(State) -> {{var,Name},State}.
 %% new_var(LineAnno, State) -> {{var,Name},State}.
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index b4bbc5e739..f8e99905b5 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -880,7 +880,7 @@ new_fun_name(Type, #kern{func={F,Arity},fcount=C}=St) ->
 %% new_var_name(State) -> {VarName,State}.
 
 new_var_name(#kern{vcount=C}=St) ->
-    {list_to_atom("ker" ++ integer_to_list(C)),St#kern{vcount=C+1}}.
+    {list_to_atom("@k" ++ integer_to_list(C)),St#kern{vcount=C+1}}.
 
 %% new_var(State) -> {#k_var{},State}.
 
@@ -1734,15 +1734,15 @@ uexpr(#k_receive_accept{anno=A}, _, St) ->
     {#k_receive_accept{anno=#k{us=[],ns=[],a=A}},[],St};
 uexpr(#k_receive_next{anno=A}, _, St) ->
     {#k_receive_next{anno=#k{us=[],ns=[],a=A}},[],St};
-uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0}=Try,
+uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
       {break,Rs0}=Br, St0) ->
     case is_in_guard(St0) of
 	true ->
 	    {[#k_var{name=X}],#k_var{name=X}} = {Vs,B0}, %Assertion.
 	    #k_atom{val=false} = H0,		%Assertion.
 	    {A1,Bu,St1} = uexpr(A0, Br, St0),
-	    {Try#k_try{anno=#k{us=Bu,ns=lit_list_vars(Rs0),a=A},
-		       arg=A1,ret=Rs0},Bu,St1};
+	    {#k_protected{anno=#k{us=Bu,ns=lit_list_vars(Rs0),a=A},
+			  arg=A1,ret=Rs0},Bu,St1};
 	false ->
 	    {Avs,St1} = new_vars(length(Vs), St0),
 	    {A1,Au,St2} = ubody(A0, {break,Avs}, St1),
@@ -1791,13 +1791,9 @@ uexpr(#ifun{anno=A,vars=Vs,body=B0}, {break,Rs}, St0) ->
 	end,
     Fun = #k_fdef{anno=#k{us=[],ns=[],a=A},func=Fname,arity=Arity,
 		  vars=Vs ++ Fvs,body=B1},
-    %% Set dummy values for Index and Uniq -- the real values will
-    %% be assigned by beam_asm.
-    Index = Uniq = 0,
     {#k_bif{anno=#k{us=Free,ns=lit_list_vars(Rs),a=A},
- 	    op=#k_internal{name=make_fun,arity=length(Free)+3},
- 	    args=[#k_atom{val=Fname},#k_int{val=Arity},
- 		  #k_int{val=Index},#k_int{val=Uniq}|Fvs],
+	    op=#k_internal{name=make_fun,arity=length(Free)+2},
+	    args=[#k_atom{val=Fname},#k_int{val=Arity}|Fvs],
  	    ret=Rs},
      Free,add_local_function(Fun, St)};
 uexpr(Lit, {break,Rs0}, St0) ->
diff --git a/lib/compiler/src/v3_kernel.hrl b/lib/compiler/src/v3_kernel.hrl
index 5216a1a620..1169a69117 100644
--- a/lib/compiler/src/v3_kernel.hrl
+++ b/lib/compiler/src/v3_kernel.hrl
@@ -66,6 +66,7 @@
 -record(k_receive_next, {anno=[]}).
 -record(k_try, {anno=[],arg,vars,body,evars,handler,ret=[]}).
 -record(k_try_enter, {anno=[],arg,vars,body,evars,handler}).
+-record(k_protected, {anno=[],arg,ret=[]}).
 -record(k_catch, {anno=[],body,ret=[]}).
 
 -record(k_guard_match, {anno=[],vars,body,ret=[]}).
diff --git a/lib/compiler/src/v3_kernel_pp.erl b/lib/compiler/src/v3_kernel_pp.erl
index 0b90f0a1e0..45065b7e11 100644
--- a/lib/compiler/src/v3_kernel_pp.erl
+++ b/lib/compiler/src/v3_kernel_pp.erl
@@ -279,6 +279,15 @@ format_1(#k_try_enter{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Ctxt) ->
      nl_indent(Ctxt),
      "end"
     ];
+format_1(#k_protected{arg=A,ret=Rs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["protected",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1),
+     nl_indent(Ctxt),
+     "end",
+     format_ret(Rs, ctxt_bump_indent(Ctxt, 1))
+    ];
 format_1(#k_catch{body=B,ret=Rs}, Ctxt) ->
     Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
     ["catch",
diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
index 1452b78d1d..4337ec732c 100644
--- a/lib/compiler/src/v3_life.erl
+++ b/lib/compiler/src/v3_life.erl
@@ -78,9 +78,7 @@ function(#k_fdef{anno=#k{a=Anno},func=F,arity=Ar,vars=Vs,body=Kb}) ->
 		     #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
 			      vars=Vs,body=Kb,ret=[]}
 	     end,
-	put(guard_refc, 0),
 	{B1,_,Vdb1} = body(B0, 1, Vdb0),
-	erase(guard_refc),
 	{function,F,Ar,As,B1,Vdb1,Anno}
     catch
 	Class:Error ->
@@ -106,12 +104,13 @@ body(Ke, I, Vdb0) ->
     E = expr(Ke, I, Vdb1),
     {[E],I,Vdb1}.
 
-%% guard(Kguard, I, Vdb) -> Guard.
+%% protected(Kprotected, I, Vdb) -> Protected.
+%%  Only used in guards.
 
-guard(#k_try{anno=A,arg=Ts,vars=[#k_var{name=X}],body=#k_var{name=X},
-	     handler=#k_atom{val=false},ret=Rs}, I, Vdb) ->
+protected(#k_protected{anno=A,arg=Ts,ret=Rs}, I, Vdb) ->
     %% Lock variables that are alive before try and used afterwards.
-    %% Don't lock variables that are only used inside the try expression.
+    %% Don't lock variables that are only used inside the protected
+    %% expression.
     Pdb0 = vdb_sub(I, I+1, Vdb),
     {T,MaxI,Pdb1} = body(Ts, I+1, Pdb0),
     Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
@@ -139,10 +138,9 @@ expr(#k_guard_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
     M = match(Kb, A#k.us, I+1, [], Mdb),
     #l{ke={guard_match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
 expr(#k_try{}=Try, I, Vdb) ->
-    case is_in_guard() of
-	false -> body_try(Try, I, Vdb);
-	true -> guard(Try, I, Vdb)
-    end;
+    body_try(Try, I, Vdb);
+expr(#k_protected{}=Protected, I, Vdb) ->
+    protected(Protected, I, Vdb);
 expr(#k_try_enter{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}, I, Vdb) ->
     %% Lock variables that are alive before the catch and used afterwards.
     %% Don't lock variables that are only used inside the try.
@@ -213,7 +211,6 @@ body_try(#k_try{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh,ret=Rs},
        i=I,vdb=Tdb1,a=A#k.a}.
 
 %% call_op(Op) -> Op.
-%% bif_op(Op) -> Op.
 %% test_op(Op) -> Op.
 %%  Do any necessary name translations here to munge into beam format.
 
@@ -221,28 +218,14 @@ call_op(#k_local{name=N}) -> N;
 call_op(#k_remote{mod=M,name=N}) -> {remote,atomic(M),atomic(N)};
 call_op(Other) -> variable(Other).
 
-bif_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N;
-bif_op(#k_internal{name=N}) -> N.
-
 test_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N.
 
 %% k_bif(Anno, Op, [Arg], [Ret], Vdb) -> Expr.
-%%  Build bifs, do special handling of internal some calls.
-
-k_bif(_A, #k_internal{name=dsetelement,arity=3}, As, []) ->
-    {bif,dsetelement,atomic_list(As),[]};
-k_bif(_A, #k_internal{name=bs_context_to_binary=Op,arity=1}, As, []) ->
-    {bif,Op,atomic_list(As),[]};
-k_bif(_A, #k_internal{name=bs_init_writable=Op,arity=1}, As, Rs) ->
-    {bif,Op,atomic_list(As),var_list(Rs)};
-k_bif(_A, #k_internal{name=make_fun},
-      [#k_atom{val=Fun},#k_int{val=Arity},
-       #k_int{val=Index},#k_int{val=Uniq}|Free],
-      Rs) ->
-    {bif,{make_fun,Fun,Arity,Index,Uniq},var_list(Free),var_list(Rs)};
-k_bif(_A, Op, As, Rs) ->
-    %% The general case.
-    Name = bif_op(Op),
+%%  Build bifs.
+
+k_bif(_A, #k_internal{name=Name}, As, Rs) ->
+    {internal,Name,atomic_list(As),var_list(Rs)};
+k_bif(_A, #k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Name}}, As, Rs) ->
     Ar = length(As),
     case is_gc_bif(Name, Ar) of
 	false ->
@@ -303,9 +286,7 @@ val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Ctxt0, Vdb0) ->
 guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Ctxt, Vdb0) ->
     Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
     Gdb = vdb_sub(I+1, I+2, Vdb1),
-    OldRefc = put(guard_refc, get(guard_refc)+1),
-    G = guard(Kg, I+1, Gdb),
-    put(guard_refc, OldRefc),
+    G = protected(Kg, I+1, Gdb),
     B = match(Kb, Ls, I+2, Ctxt, Vdb1),
     #l{ke={guard_clause,G,B},
        i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),
@@ -394,7 +375,6 @@ is_gc_bif(node, 0) -> false;
 is_gc_bif(node, 1) -> false;
 is_gc_bif(element, 2) -> false;
 is_gc_bif(get, 1) -> false;
-is_gc_bif(raise, 2) -> false;
 is_gc_bif(tuple_size, 1) -> false;
 is_gc_bif(Bif, Arity) ->
     not (erl_internal:bool_op(Bif, Arity) orelse
@@ -431,11 +411,6 @@ use_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
 add_var(V, F, L, Vdb) ->
     vdb_store_new(V, {V,F,L}, Vdb).
 
-%% is_in_guard() -> true|false.
-
-is_in_guard() ->
-    get(guard_refc) > 0.
-
 %% vdb
 
 vdb_new(Vs) ->
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index f0185acbc7..de06e8760f 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -36,7 +36,7 @@ MODULES= \
 	map_SUITE \
 	match_SUITE \
 	misc_SUITE \
-	num_bif_SUITE \
+	overridden_bif_SUITE \
 	receive_SUITE \
 	record_SUITE \
 	regressions_SUITE \
@@ -67,7 +67,7 @@ NO_OPT= \
 	map \
 	match \
 	misc \
-	num_bif \
+	overridden_bif \
 	receive \
 	record \
 	trycatch
@@ -78,6 +78,7 @@ INLINE= \
 	beam_block \
 	beam_bool \
 	beam_utils \
+	bif \
 	bs_bincomp \
 	bs_bit_binaries \
 	bs_construct \
@@ -91,7 +92,7 @@ INLINE= \
 	map \
 	match \
 	misc \
-	num_bif \
+	overridden_bif \
 	receive \
 	record
 
diff --git a/lib/compiler/test/beam_block_SUITE.erl b/lib/compiler/test/beam_block_SUITE.erl
index 9fcb6e497d..55d5f2dbe8 100644
--- a/lib/compiler/test/beam_block_SUITE.erl
+++ b/lib/compiler/test/beam_block_SUITE.erl
@@ -22,7 +22,7 @@
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 get_map_elements/1,otp_7345/1,move_opt_across_gc_bif/1,
-	 erl_202/1]).
+	 erl_202/1,repro/1]).
 
 %% The only test for the following functions is that
 %% the code compiles and is accepted by beam_validator.
@@ -39,7 +39,8 @@ groups() ->
       [get_map_elements,
        otp_7345,
        move_opt_across_gc_bif,
-       erl_202
+       erl_202,
+       repro
       ]}].
 
 init_per_suite(Config) ->
@@ -158,6 +159,27 @@ erl_202({{_, _},X}, _) ->
 erl_202({_, _}, #erl_202_r1{y=R2}) ->
     {R2#erl_202_r2.x}.
 
+%% See https://bugs.erlang.org/browse/ERL-266.
+%% Instructions with failure labels are not safe to include
+%% in a block. Including get_map_elements in a block would
+%% lead to unsafe code.
+
+repro(_Config) ->
+    [] = maps:to_list(repro([], #{}, #{})),
+    [{tmp1,n}] = maps:to_list(repro([{tmp1,0}], #{}, #{})),
+    [{tmp1,name}] = maps:to_list(repro([{tmp1,0}], #{}, #{0=>name})),
+    ok.
+
+repro([], TempNames, _Slots) ->
+    TempNames;
+repro([{Temp, Slot}|Xs], TempNames, Slots0) ->
+    {Name, Slots} =
+	case Slots0 of
+	    #{Slot := Name0} -> {Name0, Slots0};
+	    #{} ->              {n,     Slots0#{Slot => n}}
+	end,
+    repro(Xs, TempNames#{Temp => Name}, Slots).
+
 %%%
 %%% The only test of the following code is that it compiles.
 %%%
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index f6d4a311bb..5e29f8d7b4 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -283,6 +283,9 @@ coverage(_Config) ->
 
     {'EXIT',{function_clause,_}} = (catch town(overall, {{abc},alcohol})),
 
+    self() ! junk_message,
+    {"url",#{true:="url"}} = appointment(#{"resolution" => "url"}),
+
     ok.
 
 %% Cover check_liveness/3.
@@ -352,6 +355,9 @@ yellow(Hill) ->
     Hill,
     id(42).
 
+do(A, B) -> {A,B}.
+appointment(#{"resolution" := Url}) ->
+    do(receive _ -> Url end, #{true => Url}).
 
 %% The identity function.
 id(I) -> I.
diff --git a/lib/compiler/test/bif_SUITE.erl b/lib/compiler/test/bif_SUITE.erl
index 51bc71da81..bba2058f2f 100644
--- a/lib/compiler/test/bif_SUITE.erl
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -19,9 +19,11 @@
 %%
 -module(bif_SUITE).
 
+-include_lib("syntax_tools/include/merl.hrl").
+
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
-	 beam_validator/1]).
+	 beam_validator/1,trunc_and_friends/1,cover_safe_bifs/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
@@ -32,7 +34,9 @@ all() ->
 
 groups() ->
     [{p,[parallel],
-      [beam_validator
+      [beam_validator,
+       trunc_and_friends,
+       cover_safe_bifs
       ]}].
 
 init_per_suite(Config) ->
@@ -63,3 +67,56 @@ food(Curriculum) ->
      catch _ ->
 	     0
      end, Curriculum].
+
+%% Test trunc/1, round/1, floor/1, ceil/1.
+trunc_and_friends(_Config) ->
+    Bifs = [trunc,round,floor,ceil],
+    Fs = trunc_and_friends_1(Bifs),
+    Mod = ?FUNCTION_NAME,
+    Calls = [begin
+		 Atom = erl_syntax:function_name(N),
+		 ?Q("'@Atom'()")
+	     end || N <- Fs],
+    Tree = ?Q(["-module('@Mod@').",
+	       "-export([test/0]).",
+	       "test() -> _@Calls, ok.",
+	       "id(I) -> I."]) ++ Fs,
+    merl:print(Tree),
+    Opts = test_lib:opt_opts(?MODULE),
+    {ok,_Bin} = merl:compile_and_load(Tree, Opts),
+    Mod:test(),
+    ok.
+
+trunc_and_friends_1([F|Fs]) ->
+    Func = list_to_atom("f"++integer_to_list(length(Fs))),
+    [trunc_template(Func, F)|trunc_and_friends_1(Fs)];
+trunc_and_friends_1([]) -> [].
+
+trunc_template(Func, Bif) ->
+    Val = 42.77,
+    Res = erlang:Bif(Val),
+    FloatRes = float(Res),
+    ?Q("'@Func@'() ->
+        Var = id(_@Val@),
+        if _@Bif@(Var) =:= _@Res@ -> ok end,
+	if _@Bif@(Var) == _@FloatRes@ -> ok end,
+	if _@Bif@(Var) == _@Res@ -> ok end,
+        _@Res@ = _@Bif@(Var),
+        try begin _@Bif@(a), ok end
+        catch error:badarg -> ok end,
+        ok.").
+
+cover_safe_bifs(Config) ->
+    _ = get(),
+    _ = get_keys(a),
+    _ = group_leader(),
+    _ = is_alive(),
+    _ = min(Config, []),
+    _ = nodes(),
+    _ = erlang:ports(),
+    _ = pre_loaded(),
+    _ = processes(),
+    _ = registered(),
+    _ = term_to_binary(Config),
+
+    ok.
diff --git a/lib/compiler/test/bs_bincomp_SUITE.erl b/lib/compiler/test/bs_bincomp_SUITE.erl
index 4743821337..dd1d245f88 100644
--- a/lib/compiler/test/bs_bincomp_SUITE.erl
+++ b/lib/compiler/test/bs_bincomp_SUITE.erl
@@ -56,6 +56,7 @@ end_per_group(_GroupName, Config) ->
 byte_aligned(Config) when is_list(Config) ->
     cs_init(),
     <<"abcdefg">> = cs(<< <<(X+32)>> || <<X>> <= <<"ABCDEFG">> >>),
+    <<"AxyzBxyzCxyz">> = cs(<< <<X, "xyz">> || <<X>> <= <<"ABC">> >>),
     <<1:32/little,2:32/little,3:32/little,4:32/little>> =
 	cs(<< <<X:32/little>> || <<X:32>> <= <<1:32,2:32,3:32,4:32>> >>),
     cs(<<1:32/little,2:32/little,3:32/little,4:32/little>> =
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 224abf6c29..f8af070c44 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -38,7 +38,8 @@
 	 no_partition/1,calling_a_binary/1,binary_in_map/1,
 	 match_string_opt/1,select_on_integer/1,
 	 map_and_binary/1,unsafe_branch_caching/1,
-	 bad_literals/1,good_literals/1,constant_propagation/1]).
+	 bad_literals/1,good_literals/1,constant_propagation/1,
+	 parse_xml/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -69,7 +70,7 @@ groups() ->
        no_partition,calling_a_binary,binary_in_map,
        match_string_opt,select_on_integer,
        map_and_binary,unsafe_branch_caching,
-       bad_literals,good_literals,constant_propagation]}].
+       bad_literals,good_literals,constant_propagation,parse_xml]}].
 
 
 init_per_suite(Config) ->
@@ -1451,6 +1452,26 @@ constant_propagation_c() ->
 	    X
     end.
 
+parse_xml(_Config) ->
+    <<"<?xmlX">> = do_parse_xml(<<"<?xmlX">>),
+    <<" ">> = do_parse_xml(<<"<?xml ">>),
+    ok.
+
+do_parse_xml(<<"<?xml"/utf8,Rest/binary>> = Bytes) ->
+    %% Delayed sub-binary creation is not safe. A buggy (development)
+    %% version of check_liveness_everywhere() in beam_utils would turn
+    %% on the optimization.
+    Rest1 = case is_next_char_whitespace(Rest) of
+		false ->
+		    Bytes;
+		true ->
+		    id(Rest)
+	    end,
+    id(Rest1).
+
+is_next_char_whitespace(<<C/utf8,_/binary>>) ->
+    C =:= $\s.
+
 
 check(F, R) ->
     R = F().
diff --git a/lib/compiler/test/bs_utf_SUITE.erl b/lib/compiler/test/bs_utf_SUITE.erl
index c894041f72..ef3fc54b37 100644
--- a/lib/compiler/test/bs_utf_SUITE.erl
+++ b/lib/compiler/test/bs_utf_SUITE.erl
@@ -235,6 +235,7 @@ utf32_to_unicode(<<>>) -> [].
 literals(Config) when is_list(Config) ->
     abc_utf8 = match_literal(<<"abc"/utf8>>),
     abc_utf8 = match_literal(<<$a,$b,$c>>),
+    abc_utf8 = match_literal(<<$a/utf8,$b/utf8,$c/utf8>>),
 
     abc_utf16be = match_literal(<<"abc"/utf16>>),
     abc_utf16be = match_literal(<<$a:16,$b:16,$c:16>>),
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index b0148f7103..28a353d27b 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -403,12 +403,11 @@ other_output(Config) when is_list(Config) ->
 	       end],
 
     io:put_chars("to_exp (file)"),
-    {ok,simple,Expand} = compile:file(Simple, [to_exp,binary,time]),
-    case Expand of
-	{simple,Exports,Forms} when is_list(Exports), is_list(Forms) -> ok
-    end,
+    {ok,[],Expand} = compile:file(Simple, [to_exp,binary,time]),
+    true = is_list(Expand),
+    {attribute,_,module,simple} = lists:keyfind(module, 3, Expand),
     io:put_chars("to_exp (forms)"),
-    {ok,simple,Expand} = compile:forms(PP, [to_exp,binary,time]),
+    {ok,[],Expand} = compile:forms(PP, [to_exp,binary,time]),
 
     io:put_chars("to_core (file)"),
     {ok,simple,Core} = compile:file(Simple, [to_core,binary,time]),
diff --git a/lib/compiler/test/compiler.cover b/lib/compiler/test/compiler.cover
index 3fd7fc1937..2be079944f 100644
--- a/lib/compiler/test/compiler.cover
+++ b/lib/compiler/test/compiler.cover
@@ -1,5 +1,5 @@
 {incl_app,compiler,details}.
 
 %% -*- erlang -*-
-{excl_mods,compiler,[core_scan,core_parse]}.
+{excl_mods,compiler,[core_scan,core_parse,sys_pre_expand]}.
 
diff --git a/lib/compiler/test/float_SUITE.erl b/lib/compiler/test/float_SUITE.erl
index f6095947ca..0ebc71eb9b 100644
--- a/lib/compiler/test/float_SUITE.erl
+++ b/lib/compiler/test/float_SUITE.erl
@@ -150,6 +150,11 @@ math_functions(Config) when is_list(Config) ->
     ?OPTIONAL(0.0, math:erf(id(0))),
     ?OPTIONAL(1.0, math:erfc(id(0))),
 
+    5.0 = math:floor(5.6),
+    6.0 = math:ceil(5.6),
+    5.0 = math:floor(id(5.4)),
+    6.0 = math:ceil(id(5.4)),
+
     %% Only for coverage (of beam_type.erl).
     {'EXIT',{undef,_}} = (catch math:fnurfla(0)),
     {'EXIT',{undef,_}} = (catch math:fnurfla(0, 0)),
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index 127679ba69..52b2da05f7 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -576,7 +576,15 @@ grab_bag_remove_failure([{stretch,_,Mi}=Stretch | Specs], Unit, _MaxFailure) ->
 
 %% Regression in 19.0, reported by Alexei Sholik
 literal_binary(_Config) ->
-    3 = literal_binary_match(bar,<<"y">>),
+    3 = literal_binary_match(bar, <<"y">>),
+
+    %% While we are at it, also test the remaining code paths
+    %% in literal_binary_match/2.
+    1 = literal_binary_match(bar, <<"x">>),
+    2 = literal_binary_match(foo, <<"x">>),
+    3 = literal_binary_match(foo, <<"y">>),
+    fail = literal_binary_match(bar, <<"z">>),
+    fail = literal_binary_match(foo, <<"z">>),
     ok.
 
 literal_binary_match(bar, <<"x">>) -> 1;
diff --git a/lib/compiler/test/num_bif_SUITE.erl b/lib/compiler/test/num_bif_SUITE.erl
deleted file mode 100644
index 7eac90bac3..0000000000
--- a/lib/compiler/test/num_bif_SUITE.erl
+++ /dev/null
@@ -1,285 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(num_bif_SUITE).
-
--include_lib("common_test/include/ct.hrl").
-
-%% Tests optimization of the BIFs:
-%% 	abs/1
-%%	float/1
-%%	float_to_list/1
-%%	integer_to_list/1
-%%	list_to_float/1
-%%	list_to_integer/1
-%%	round/1
-%%	trunc/1
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, t_abs/1, t_float/1,
-	 t_float_to_list/1, t_integer_to_list/1,
-	 t_list_to_integer/1,
-	 t_list_to_float_safe/1, t_list_to_float_risky/1,
-	 t_round/1, t_trunc/1]).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    test_lib:recompile(?MODULE),
-    [t_abs, t_float, t_float_to_list, t_integer_to_list,
-     {group, t_list_to_float}, t_list_to_integer, t_round,
-     t_trunc].
-
-groups() -> 
-    [{t_list_to_float, [],
-      [t_list_to_float_safe, t_list_to_float_risky]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-t_abs(Config) when is_list(Config) ->
-    %% Floats.
-    5.5 = abs(5.5),
-    0.0 = abs(0.0),
-    100.0 = abs(-100.0),
-    
-    %% Integers.
-    5 = abs(5),
-    0 = abs(0),
-    100 = abs(-100),
-
-    %% The largest smallnum. OTP-3190.
-    X = (1 bsl 27) - 1,
-    X = abs(X),
-    X = abs(X-1)+1,
-    X = abs(X+1)-1,
-    X = abs(-X),
-    X = abs(-X-1)-1,
-    X = abs(-X+1)+1,
-
-    %% Bignums.
-    BigNum = 13984792374983749,
-    BigNum = abs(BigNum),
-    BigNum = abs(-BigNum),
-    ok.
-    
-t_float(Config) when is_list(Config) ->
-    0.0 = float(0),
-    2.5 = float(2.5),
-    0.0 = float(0.0),
-    -100.55 = float(-100.55),
-    42.0 = float(42),
-    -100.0 = float(-100),
-
-    %% Bignums.
-    4294967305.0 = float(4294967305),
-    -4294967305.0 = float(-4294967305),
-
-    %% Extremly big bignums.
-    Big = list_to_integer(lists:duplicate(2000, $1)),
-    {'EXIT', {badarg, _}} = (catch float(Big)),
-
-    %% Invalid types and lists.
-    {'EXIT', {badarg, _}} = (catch list_to_integer(atom)),
-    {'EXIT', {badarg, _}} = (catch list_to_integer(123)),
-    {'EXIT', {badarg, _}} = (catch list_to_integer([$1, [$2]])),
-    {'EXIT', {badarg, _}} = (catch list_to_integer("1.2")),
-    {'EXIT', {badarg, _}} = (catch list_to_integer("a")),
-    {'EXIT', {badarg, _}} = (catch list_to_integer("")),
-    ok.
-
-
-%% Tests float_to_list/1.
-
-t_float_to_list(Config) when is_list(Config) ->
-    test_ftl("0.0e+0", 0.0),
-    test_ftl("2.5e+1", 25.0),
-    test_ftl("2.5e+0", 2.5),
-    test_ftl("2.5e-1", 0.25),
-    test_ftl("-3.5e+17", -350.0e15),
-    ok.
-    
-test_ftl(Expect, Float) ->
-    %% No on the next line -- we want the line number from t_float_to_list.
-    Expect = remove_zeros(lists:reverse(float_to_list(Float)), []).
-
-%% Removes any non-significant zeros in a floating point number.
-%% Example: 2.500000e+01 -> 2.5e+1
-
-remove_zeros([$+, $e|Rest], [$0, X|Result]) ->
-    remove_zeros([$+, $e|Rest], [X|Result]);
-remove_zeros([$-, $e|Rest], [$0, X|Result]) ->
-    remove_zeros([$-, $e|Rest], [X|Result]);
-remove_zeros([$0, $.|Rest], [$e|Result]) ->
-    remove_zeros(Rest, [$., $0, $e|Result]);
-remove_zeros([$0|Rest], [$e|Result]) ->
-    remove_zeros(Rest, [$e|Result]);
-remove_zeros([Char|Rest], Result) ->
-    remove_zeros(Rest, [Char|Result]);
-remove_zeros([], Result) ->
-    Result.
-
-%% Tests integer_to_list/1.
-
-t_integer_to_list(Config) when is_list(Config) ->
-    "0" = integer_to_list(0),
-    "42" = integer_to_list(42),
-    "-42" = integer_to_list(-42),
-    "-42" = integer_to_list(-42),
-    "32768" = integer_to_list(32768),
-    "268435455" = integer_to_list(268435455),
-    "-268435455" = integer_to_list(-268435455),
-    "123456932798748738738" = integer_to_list(123456932798748738738),
-    Big_List = lists:duplicate(2000, $1),
-    Big = list_to_integer(Big_List),
-    Big_List = integer_to_list(Big),
-    ok.
-
-%% Tests list_to_float/1.
-
-
-t_list_to_float_safe(Config) when is_list(Config) ->
-    0.0 = list_to_float("0.0"),
-    0.0 = list_to_float("-0.0"),
-    0.5 = list_to_float("0.5"),
-    -0.5 = list_to_float("-0.5"),
-    100.0 = list_to_float("1.0e2"),
-    127.5 = list_to_float("127.5"),
-    -199.5 = list_to_float("-199.5"),
-
-    {'EXIT', {badarg, _}} = (catch list_to_float("0")),
-    {'EXIT', {badarg, _}} = (catch list_to_float("0..0")),
-    {'EXIT', {badarg, _}} = (catch list_to_float("0e12")),
-    {'EXIT', {badarg, _}} = (catch list_to_float("--0.0")),
-%%    {'EXIT', {badarg, _}} = (catch list_to_float("0.0e+99999999")),
-
-    ok.
-
-%% This might crash the emulator...
-%% (Known to crash the Unix version of Erlang 4.4.1)
-
-t_list_to_float_risky(Config) when is_list(Config) ->
-    Many_Ones = lists:duplicate(25000, $1),
-    _ = list_to_float("2."++Many_Ones),
-    {'EXIT', {badarg, _}} = (catch list_to_float("2"++Many_Ones)),
-    ok.
-
-%% Tests list_to_integer/1.
-
-t_list_to_integer(Config) when is_list(Config) ->
-    0 = list_to_integer("0"),
-    0 = list_to_integer("00"),
-    0 = list_to_integer("-0"),
-    1 = list_to_integer("1"),
-    -1 = list_to_integer("-1"),
-    42 = list_to_integer("42"),
-    -12 = list_to_integer("-12"),
-    32768 = list_to_integer("32768"),
-    268435455 = list_to_integer("268435455"),
-    -268435455 = list_to_integer("-268435455"),
-
-    %% Bignums.
-    123456932798748738738 = list_to_integer("123456932798748738738"),
-    _ = list_to_integer(lists:duplicate(2000, $1)),
-    ok.
-
-%% Tests round/1.
-
-t_round(Config) when is_list(Config) ->
-    0 = round(0.0),
-    0 = round(0.4),
-    1 = round(0.5),
-    0 = round(-0.4),
-    -1 = round(-0.5),
-    255 = round(255.3),
-    256 = round(255.6),
-    -1033 = round(-1033.3),
-    -1034 = round(-1033.6),
-    
-    % OTP-3722:
-    X = (1 bsl 27) - 1,
-    MX = -X,
-    MXm1 = -X-1,
-    MXp1 = -X+1,
-    F = X + 0.0,
-    X = round(F),
-    X = round(F+1)-1,
-    X = round(F-1)+1,
-    MX = round(-F),
-    MXm1 = round(-F-1),
-    MXp1 = round(-F+1),
-
-    X = round(F+0.1),
-    X = round(F+1+0.1)-1,
-    X = round(F-1+0.1)+1,
-    MX = round(-F+0.1),
-    MXm1 = round(-F-1+0.1),
-    MXp1 = round(-F+1+0.1),
-
-    X = round(F-0.1),
-    X = round(F+1-0.1)-1,
-    X = round(F-1-0.1)+1,
-    MX = round(-F-0.1),
-    MXm1 = round(-F-1-0.1),
-    MXp1 = round(-F+1-0.1),
-
-    0.5 = abs(round(F+0.5)-(F+0.5)),
-    0.5 = abs(round(F-0.5)-(F-0.5)),
-    0.5 = abs(round(-F-0.5)-(-F-0.5)),
-    0.5 = abs(round(-F+0.5)-(-F+0.5)),
-
-    %% Bignums.
-    4294967296 = round(4294967296.1),
-    4294967297 = round(4294967296.9),
-    -4294967296 = -round(4294967296.1),
-    -4294967297 = -round(4294967296.9),
-    ok.
-
-t_trunc(Config) when is_list(Config) ->
-    0 = trunc(0.0),
-    5 = trunc(5.3333),
-    -10 = trunc(-10.978987),
-    % The largest smallnum, converted to float (OTP-3722):
-    X = (1 bsl 27) - 1,
-    F = X + 0.0,
-    io:format("X = ~p/~w/~w, F = ~p/~w/~w, trunc(F) = ~p/~w/~w~n",
-	      [X, X, binary_to_list(term_to_binary(X)),
-	       F, F, binary_to_list(term_to_binary(F)),
-	       trunc(F), trunc(F), binary_to_list(term_to_binary(trunc(F)))]),
-    X = trunc(F),
-    X = trunc(F+1)-1,
-    X = trunc(F-1)+1,
-    X = -trunc(-F),
-    X = -trunc(-F-1)-1,
-    X = -trunc(-F+1)+1,
-
-    %% Bignums.
-    4294967305 = trunc(4294967305.7),
-    -4294967305 = trunc(-4294967305.7),
-    ok.
diff --git a/lib/compiler/test/overridden_bif_SUITE.erl b/lib/compiler/test/overridden_bif_SUITE.erl
new file mode 100644
index 0000000000..ce18916515
--- /dev/null
+++ b/lib/compiler/test/overridden_bif_SUITE.erl
@@ -0,0 +1,101 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(overridden_bif_SUITE).
+-compile({no_auto_import,[is_reference/1,size/1]}).
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 overridden_bif/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+%% Used by overridden_bif/1.
+-import(gb_sets, [size/1]).
+-import(test_lib, [binary/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
+
+all() ->
+    test_lib:recompile(?MODULE),
+    [{group,p}].
+
+groups() ->
+    [{p,test_lib:parallel(),
+      [overridden_bif
+      ]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+    Config.
+
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+    ok.
+
+overridden_bif(_Config) ->
+    L = [-3,-2,-1,0,1,2,3,4],
+    [-3,0,3] = do_overridden_bif_1(L),
+    [-2,0,2,4] = do_overridden_bif_2(L),
+    [3] = do_overridden_bif_3(L),
+    [2,4] = do_overridden_bif_4(L),
+
+    Set = gb_sets:from_list(L),
+    [Set] = do_overridden_bif_5([gb_sets:singleton(42),Set]),
+
+    [100,0] = do_overridden_bif_6([100|L]),
+    ok.
+
+do_overridden_bif_1(L) ->
+    [E || E <- L, is_reference(E)].
+
+do_overridden_bif_2(L) ->
+    [E || E <- L, port(E)].
+
+do_overridden_bif_3(L) ->
+    [E || E <- L, (is_reference(E) andalso E > 0)].
+
+do_overridden_bif_4(L) ->
+    [E || E <- L, (port(E) andalso E > 0)].
+
+do_overridden_bif_5(L) ->
+    [E || E <- L, size(E) > 1].
+
+do_overridden_bif_6(L) ->
+    [E || E <- L, binary(E)].
+
+is_reference(N) ->
+    N rem 3 =:= 0.
+
+port(N) ->
+    N rem 2 =:= 0.
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index d5b79e2357..8954a9f5fb 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -22,7 +22,10 @@
 -include_lib("common_test/include/ct.hrl").
 -compile({no_auto_import,[binary_part/2]}).
 -export([id/1,recompile/1,parallel/0,uniq/0,opt_opts/1,get_data_dir/1,
-	 is_cloned_mod/1,smoke_disasm/1,p_run/2,binary_part/2]).
+	 is_cloned_mod/1,smoke_disasm/1,p_run/2]).
+
+%% Used by test case that override BIFs.
+-export([binary_part/2,binary/1]).
 
 id(I) -> I.
 
@@ -151,3 +154,7 @@ p_run_loop(Test, List, N, Refs0, Errors0, Ws0) ->
 %% This is for the misc_SUITE:override_bif testcase
 binary_part(_A,_B) ->
     dummy.
+
+%% This is for overridden_bif_SUITE.
+binary(N) ->
+    N rem 10 =:= 0.