4 files changed, 30 insertions, 4 deletions
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index e35692efd1..25b7f677b5 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -21,7 +21,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 test1/1,overwritten_fun/1,otp_7202/1,bif_fun/1,
-	 external/1,eep37/1]).
+	 external/1,eep37/1,badarity/1]).
 
 %% Internal export.
 -export([call_me/1]).
@@ -32,7 +32,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [test1,overwritten_fun,otp_7202,bif_fun,external,eep37].
+    [test1,overwritten_fun,otp_7202,bif_fun,external,eep37,badarity].
 
 groups() -> 
     [].
@@ -206,5 +206,9 @@ eep37(Config) when is_list(Config) ->
     50 = UnusedName(8),
     ok.
 
+badarity(Config) when is_list(Config) ->
+    {'EXIT',{{badarity,{_,[]}},_}} = (catch (fun badarity/1)()),
+    ok.
+
 id(I) ->
     I.
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index a0a9bb7ddd..2d9e8d1ac0 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -1023,6 +1023,10 @@ is_function_2(Config) when is_list(Config) ->
     true = is_function(id(fun() -> ok end), 0),
     false = is_function(id(fun ?MODULE:all/1), 0),
     false = is_function(id(fun() -> ok end), 1),
+    {'EXIT',{badarg,_}} =
+        (catch is_function(id(fun() -> ok end), -1) orelse error),
+    {'EXIT',{badarg,_}} =
+        (catch is_function(id(fun() -> ok end), '') orelse error),
 
     F = fun(_) -> ok end,
     if
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index b4baef461b..3639192a51 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -42,7 +42,8 @@
 	t_build_and_match_val/1,
 
 	%% errors in 17.0-rc1
-	t_update_values/1
+	t_update_values/1,
+        t_expand_map_update/1
     ]).
 
 suite() -> [].
@@ -68,7 +69,8 @@ all() -> [
 	t_build_and_match_val,
 
 	%% errors in 17.0-rc1
-	t_update_values
+	t_update_values,
+        t_expand_map_update
     ].
 
 groups() -> [].
@@ -273,12 +275,18 @@ t_update_values(Config) when is_list(Config) ->
 	end, {none, none, #{val1=>none,val2=>none}},List),
     ok.
 
+t_expand_map_update(Config) when is_list(Config) ->
+    M = #{<<"hello">> => <<"world">>}#{<<"hello">> := <<"les gens">>},
+    #{<<"hello">> := <<"les gens">>} = M,
+    ok.
+
 check_val(#{val1:=V1, val2:=V2},V1,V2) -> ok.
 
 get_val(#{ "wazzup" := _, val := V}) -> V;
 get_val(#{ val := V }) -> {some_val, V}.
 
 t_guard_bifs(Config) when is_list(Config) ->
+    true   = map_guard_empty(),
     true   = map_guard_head(#{a=>1}),
     false  = map_guard_head([]),
     true   = map_guard_body(#{a=>1}),
@@ -287,6 +295,8 @@ t_guard_bifs(Config) when is_list(Config) ->
     false  = map_guard_pattern("list"),
     ok.
 
+map_guard_empty() when is_map(#{}); false -> true.
+
 map_guard_head(M) when is_map(M) -> true;
 map_guard_head(_) -> false.
 
diff --git a/lib/compiler/test/record_SUITE.erl b/lib/compiler/test/record_SUITE.erl
index c9f5a2053e..f736e14bf6 100644
--- a/lib/compiler/test/record_SUITE.erl
+++ b/lib/compiler/test/record_SUITE.erl
@@ -369,6 +369,14 @@ record_test_3(Config) when is_list(Config) ->
     ?line false = is_record(id(#barf{}), id(barf), id(42)),
     ?line false = is_record(id(#barf{}), id(foo), id(6)),
 
+    Rec = id(#barf{}),
+    Good = id(barf),
+    Bad = id(foo),
+    Size = id(6),
+
+    true = is_record(Rec, Good, Size) orelse error,
+    error = is_record(Rec, Bad, Size) orelse error,
+
     ok.
 
 record_access_in_guards(Config) when is_list(Config) ->