Merge branch 'maint'

* maint:
  Updated OTP version
  Update release notes
  Update version numbers
  Eliminate a crash in the beam_jump pass
  stdlib: Fix a 'chars_limit' bug
  Fix a race condition when generating async operation ids
  Fix internal compiler error for map_get/2
  beam_type: Fix unsafe optimization
  public_key: Remove moduli 5121 and 7167 Thoose were added by 598629aeba9de98e8cdf5637043eb34e5d407751 but are not universaly supported.

3 files changed, 59 insertions, 4 deletions

diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
index 499b9b41df..1355f9f862 100644
--- a/lib/compiler/test/beam_type_SUITE.erl
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -23,7 +23,7 @@
 	 init_per_group/2,end_per_group/2,
 	 integers/1,coverage/1,booleans/1,setelement/1,cons/1,
 	 tuple/1,record_float/1,binary_float/1,float_compare/1,
-	 arity_checks/1,elixir_binaries/1]).
+	 arity_checks/1,elixir_binaries/1,find_best/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -43,7 +43,8 @@ groups() ->
        binary_float,
        float_compare,
        arity_checks,
-       elixir_binaries
+       elixir_binaries,
+       find_best
       ]}].
 
 init_per_suite(Config) ->
@@ -292,6 +293,33 @@ elixir_bitstring_3(Bar) when is_bitstring(Bar) ->
               list_to_bitstring(Rewrite)
       end/bitstring>>.
 
+find_best(_Config) ->
+    ok = find_best([a], nil),
+    ok = find_best([<<"a">>], nil),
+    {error,_} = find_best([], nil),
+    ok.
+
+%% Failed because beam_type assumed that the operand
+%% for bs_context_binary must be a binary. Not true!
+find_best([a|Tail], Best) ->
+    find_best(Tail,
+      case Best of
+          X when X =:= nil orelse X =:= false -> a;
+          X -> X
+      end);
+find_best([<<"a">>|Tail], Best) ->
+    find_best(Tail,
+      case Best of
+          X when X =:= nil orelse X =:= false -> <<"a">>;
+          X -> X
+      end);
+find_best([], a) ->
+    ok;
+find_best([], <<"a">>) ->
+    ok;
+find_best([], nil) ->
+    {error,<<"should not get here">>}.
+
 
 id(I) ->
     I.
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index 360dcc1e84..8fd4a4c68b 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -25,7 +25,8 @@
 	 is_not_killed/1,is_not_used_at/1,
 	 select/1,y_catch/1,otp_8949_b/1,liveopt/1,coverage/1,
          y_registers/1,user_predef/1,scan_f/1,cafu/1,
-         receive_label/1,read_size_file_version/1,not_used/1]).
+         receive_label/1,read_size_file_version/1,not_used/1,
+         is_used_fr/1]).
 -export([id/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -52,7 +53,8 @@ groups() ->
        scan_f,
        cafu,
        read_size_file_version,
-       not_used
+       not_used,
+       is_used_fr
       ]}].
 
 init_per_suite(Config) ->
@@ -550,5 +552,24 @@ not_used_p(_C, S, K, L) when is_record(K, k) ->
             id(K)
     end.
 
+is_used_fr(Config) ->
+    1 = is_used_fr(self(), self()),
+    1 = is_used_fr(self(), other),
+    receive 1 -> ok end,
+    receive 1 -> ok end,
+    receive 1 -> ok end,
+    receive 1 -> ok end,
+    ok.
+
+is_used_fr(X, Y) ->
+    %% beam_utils:is_used({fr,R}, Code) would crash.
+    _ = 0 / (X ! 1),
+    _ = case Y of
+            X -> ok;
+            _ -> error
+        end,
+    X ! 1.
+
+
 %% The identity function.
 id(I) -> I.
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index 6badc7a8b8..494faf299b 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -706,6 +706,12 @@ t_map_get(Config) when is_list(Config) ->
     {'EXIT',{{badmap,[]},_}} = (catch map_get(a, [])),
     {'EXIT',{{badmap,<<1,2,3>>},_}} = (catch map_get(a, <<1,2,3>>)),
     {'EXIT',{{badmap,1},_}} = (catch map_get(a, 1)),
+
+    %% Test that beam_validator understands that NewMap is
+    %% a map after seeing map_get(a, NewMap).
+    NewMap = id(#{a=>b}),
+    b = map_get(a, NewMap),
+    #{a:=z} = NewMap#{a:=z},
     ok.
 
 check_map_value(Map, Key, Value) when map_get(Key, Map) =:= Value -> true;