3 files changed, 47 insertions, 4 deletions
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 6bde2f1da9..bba2058f2f 100644
--- a/lib/compiler/test/bif_SUITE.erl
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -23,7 +23,7 @@
 
 -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,trunc_and_friends/1]).
+	 beam_validator/1,trunc_and_friends/1,cover_safe_bifs/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
@@ -35,7 +35,8 @@ all() ->
 groups() ->
     [{p,[parallel],
       [beam_validator,
-       trunc_and_friends
+       trunc_and_friends,
+       cover_safe_bifs
       ]}].
 
 init_per_suite(Config) ->
@@ -104,3 +105,18 @@ trunc_template(Func, Bif) ->
         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_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().