File 1281-Stop-using-the-r18-r19-r20-and-r21-options... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1281-Stop-using-the-r18-r19-r20-and-r21-options.patch of Package erlang (Revision c584b326f39066625edf7d62736599b6)

Currently displaying revision c584b326f39066625edf7d62736599b6 , Show latest

From d055a6b20c43bee3ac4ee4c2c8981128e0369596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 4 Jun 2020 08:09:15 +0200
Subject: [PATCH 1/2] Stop using the r18, r19, r20, and r21 options

---
 erts/emulator/test/erts_test_utils.erl        |  2 +-
 erts/emulator/test/map_SUITE.erl              | 15 +---
 .../test/map_SUITE_data/badmap_17.erl         | 58 --------------
 erts/test/upgrade_SUITE.erl                   |  2 +-
 lib/common_test/src/test_server_node.erl      |  7 +-
 lib/compiler/test/Makefile                    | 18 ++---
 lib/compiler/test/compile_SUITE.erl           | 48 ++++++------
 lib/compiler/test/compile_SUITE_data/funs.erl |  8 ++
 lib/compiler/test/test_lib.erl                |  1 -
 lib/kernel/test/kernel_SUITE.erl              |  2 +-
 lib/kernel/test/seq_trace_SUITE.erl           | 75 +------------------
 lib/observer/test/crashdump_helper.erl        |  2 +-
 lib/sasl/test/sasl_SUITE.erl                  |  2 +-
 lib/stdlib/test/beam_lib_SUITE.erl            |  1 -
 lib/stdlib/test/stdlib_SUITE.erl              |  2 +-
 15 files changed, 51 insertions(+), 192 deletions(-)
 delete mode 100644 erts/emulator/test/map_SUITE_data/badmap_17.erl
 create mode 100644 lib/compiler/test/compile_SUITE_data/funs.erl

diff --git a/erts/emulator/test/erts_test_utils.erl b/erts/emulator/test/erts_test_utils.erl
index 1759a464e2..158b78c2c1 100644
--- a/erts/emulator/test/erts_test_utils.erl
+++ b/erts/emulator/test/erts_test_utils.erl
@@ -19,7 +19,7 @@
 %%
 
 -module(erts_test_utils).
--compile(r20).
+-compile(r22).
 
 %%
 %% THIS MODULE IS ALSO USED BY *OTHER* APPLICATIONS TEST CODE
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl
index 5707a8e56c..daf3110b82 100644
--- a/erts/emulator/test/map_SUITE.erl
+++ b/erts/emulator/test/map_SUITE.erl
@@ -85,7 +85,6 @@
          %% instruction-level tests
          t_has_map_fields/1,
          y_regs/1,
-         badmap_17/1,
 
          %%Bugs
          t_large_unequal_bins_same_hash_bug/1]).
@@ -102,7 +101,7 @@
 suite() -> [].
 
 all() ->
-    run_once() ++ [{group,main}].
+    [{group,main}].
 
 groups() ->
     [{main,[],
@@ -160,8 +159,7 @@ groups() ->
        y_regs,
 
        %% Bugs
-       t_large_unequal_bins_same_hash_bug]},
-     {once,[],[badmap_17]}].
+       t_large_unequal_bins_same_hash_bug]}].
 
 run_once() ->
     case ?MODULE of
@@ -3211,15 +3209,6 @@ do_badmap(Test) ->
 	     [],{a,b,c},[a,b],atom,10.0,42,(1 bsl 65) + 3],
     [Test(T) || T <- Terms].
 
-%% Test that a module compiled with the OTP 17 compiler will
-%% generate the correct 'badmap' exception.
-badmap_17(Config) ->
-    Mod = badmap_17,
-    DataDir = test_server:lookup_config(data_dir, Config),
-    Beam = filename:join(DataDir, Mod),
-    {module,Mod} = code:load_abs(Beam),
-    do_badmap(fun Mod:update/1).
-
 %% Use this function to avoid compile-time evaluation of an expression.
 id(I) -> I.
 
diff --git a/erts/emulator/test/map_SUITE_data/badmap_17.erl b/erts/emulator/test/map_SUITE_data/badmap_17.erl
deleted file mode 100644
index 887fc2e5e3..0000000000
--- a/erts/emulator/test/map_SUITE_data/badmap_17.erl
+++ /dev/null
@@ -1,58 +0,0 @@
--module(badmap_17).
--export([update/1]).
-
-%% Compile this source file with OTP 17.0.
-
-update(Map) ->
-    try
-	update_1(Map),
-	error(update_did_not_fail)
-    catch
-	error:{badmap,Map} ->
-	    ok
-    end,
-    try
-	update_2(Map),
-	error(update_did_not_fail)
-    catch
-	error:{badmap,Map} ->
-	    ok
-    end,
-    try
-	update_3(Map),
-	error(update_did_not_fail)
-    catch
-	error:{badmap,Map} ->
-	    ok
-    end,
-    ok = update_4(Map),
-    ok = update_5(Map),
-    ok.
-
-update_1(M) ->
-    M#{a=>42}.
-
-update_2(M) ->
-    M#{a:=42}.
-
-update_3(M) ->
-    id(M),
-    M#{a=>42}.
-
-update_4(M) when M#{a=>b} =:= M ->
-    did_not_fail;
-update_4(_) ->
-    ok.
-
-update_5(M) ->
-    id(M),
-    case id(true) of
-        true when M#{a=>b} =:= M ->
-            did_not_fail;
-        true ->
-            ok
-    end.
-
-id(I) ->
-    I.
-
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index 3c1d220b47..8df4a50ec2 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -20,7 +20,7 @@
 
 -compile(export_all).
 
--compile(r21).
+-compile(r22).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index e03337a780..052824b4bd 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -18,12 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(test_server_node).
--compile(r20).
-
-%%%
-%%% The same compiled code for this module must be possible to load
-%%% in R16B and later.
-%%%
+-compile(r22).
 
 %% Test Controller interface
 -export([is_release_available/1, find_release/1]).
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 9019429414..467a2be6e3 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -103,9 +103,7 @@ INLINE= \
 	receive \
 	record
 
-R21= \
-        bs_construct \
-        bs_match \
+R23= \
         fun
 
 DIALYZER = bs_match
@@ -128,8 +126,8 @@ NO_CORE_OPT_MODULES= $(NO_OPT:%=%_no_copt_SUITE)
 NO_CORE_OPT_ERL_FILES= $(NO_CORE_OPT_MODULES:%=%.erl)
 INLINE_MODULES= $(INLINE:%=%_inline_SUITE)
 INLINE_ERL_FILES= $(INLINE_MODULES:%=%.erl)
-R21_MODULES= $(R21:%=%_r21_SUITE)
-R21_ERL_FILES= $(R21_MODULES:%=%.erl)
+R23_MODULES= $(R23:%=%_r23_SUITE)
+R23_ERL_FILES= $(R23_MODULES:%=%.erl)
 NO_MOD_OPT_MODULES= $(NO_MOD_OPT:%=%_no_module_opt_SUITE)
 NO_MOD_OPT_ERL_FILES= $(NO_MOD_OPT_MODULES:%=%.erl)
 NO_SSA_OPT_MODULES= $(NO_SSA_OPT:%=%_no_ssa_opt_SUITE)
@@ -169,7 +167,7 @@ EBIN = .
 DISABLE_SSA_OPT = +no_bool_opt +no_share_opt +no_bsm_opt +no_fun_opt +no_ssa_opt +no_recv_opt
 
 make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(NO_SSA_OPT_ERL_FILES) \
-  $(NO_CORE_OPT_ERL_FILES) $(INLINE_ERL_FILES) $(R21_ERL_FILES) \
+  $(NO_CORE_OPT_ERL_FILES) $(INLINE_ERL_FILES) $(R23_ERL_FILES) \
   $(NO_MOD_OPT_ERL_FILES) $(NO_TYPE_OPT_ERL_FILES) \
   $(DIALYZER_ERL_FILES)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
@@ -184,8 +182,8 @@ make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(NO_SSA_OPT_ERL_FILES
 	  -o$(EBIN) $(NO_CORE_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +inline $(ERL_COMPILE_FLAGS) \
 	  -o$(EBIN) $(INLINE_MODULES) >> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile +r21 $(ERL_COMPILE_FLAGS) \
-	  -o$(EBIN) $(R21_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +r23 $(ERL_COMPILE_FLAGS) \
+	  -o$(EBIN) $(R23_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +no_module_opt $(ERL_COMPILE_FLAGS) \
 	  -o$(EBIN) $(NO_MOD_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +from_core $(ERL_COMPILE_FLAGS) \
@@ -224,7 +222,7 @@ docs:
 %_inline_SUITE.erl: %_SUITE.erl
 	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
 
-%_r21_SUITE.erl: %_SUITE.erl
+%_r23_SUITE.erl: %_SUITE.erl
 	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
 
 %_no_module_opt_SUITE.erl: %_SUITE.erl
@@ -248,7 +246,7 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DATA) compiler.spec compiler.cover \
 		$(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
-		$(INLINE_ERL_FILES) $(R21_ERL_FILES) \
+		$(INLINE_ERL_FILES) $(R23_ERL_FILES) \
 		$(NO_CORE_OPT_ERL_FILES) \
 		$(NO_MOD_OPT_ERL_FILES) \
 		$(NO_SSA_OPT_ERL_FILES) \
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 075f420b2c..12fadd59d5 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -879,9 +879,8 @@ utf8_atoms(Config) when is_list(Config) ->
 	beam_lib:chunks(Utf8AtomBin, [atoms]),
     code:load_binary(utf8_atom, "compile_SUITE", Utf8AtomBin),
     Atom = utf8_atom:atom(),
-
-    NoUtf8AtomForms = [{attribute,Anno,module,no_utf8_atom}|Forms],
-    error = compile:forms(NoUtf8AtomForms, [binary, r19]).
+    true = is_atom(Atom),
+    ok.
 
 utf8_functions(Config) when is_list(Config) ->
     Anno = erl_anno:new(1),
@@ -1571,45 +1570,46 @@ env_compiler_options(_Config) ->
 bc_options(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
 
-    L = [{101, small_float, [no_shared_fun_wrappers,
-                             no_get_hd_tl,no_line_info]},
-         {125, small_float, [no_shared_fun_wrappers,no_get_hd_tl,
+    DataDir = proplists:get_value(data_dir, Config),
+
+    L = [{101, small_float, [no_shared_fun_wrappers,no_line_info]},
+         {125, small_float, [no_shared_fun_wrappers,
                              no_line_info,
                              no_ssa_opt_float]},
 
-         {132, small, [no_init_yregs,no_shared_fun_wrappers,
-                       no_put_tuple2,no_get_hd_tl,no_ssa_opt_record,
-                       no_ssa_opt_float,no_line_info,no_bsm3]},
-
-         {153, small, [r20]},
-         {153, small, [r21]},
-
-         {153, big, [r18]},
-         {153, big, [r19]},
          {153, small_float, [no_shared_fun_wrappers]},
 
-         {158, small_maps, [r18]},
-         {158, small_maps, [r19]},
-         {158, small_maps, [r20]},
-         {158, small_maps, [r21]},
-
          {164, small_maps, [no_init_yregs,no_shared_fun_wrappers]},
          {164, small_maps, [r22]},
          {164, big, [r22]},
+         {164, funs, [r22]},
+         {164, funs, [no_init_yregs,no_shared_fun_wrappers,
+                      no_ssa_opt_record,
+                      no_line_info,no_stack_trimming,
+                      no_make_fun3]},
 
          {168, small, [r22]},
 
          {169, big, [no_init_yregs,no_shared_fun_wrappers,
-                     no_put_tuple2,no_get_hd_tl,no_ssa_opt_record,
+                     no_ssa_opt_record,
                      no_line_info,no_stack_trimming,
                      no_make_fun3]},
          {169, big, [r23]},
 
          {169, small_maps, [no_init_yregs]},
 
-         {170, small, [no_shared_fun_wrappers,no_init_yregs]},
+         {170, small, [no_init_yregs,no_shared_fun_wrappers,
+                       no_ssa_opt_record,
+                       no_ssa_opt_float,no_line_info]},
+
+         {171, big, [no_init_yregs,no_shared_fun_wrappers,
+                     no_ssa_opt_record,
+                     no_ssa_opt_float,no_line_info]},
+         {171, funs, [no_init_yregs,no_shared_fun_wrappers,
+                      no_ssa_opt_record,
+                      no_ssa_opt_float,no_line_info]},
 
-         {171, big, [no_init_yregs]},
+         {172, funs, []},
          {172, big, []}
         ],
 
@@ -1628,7 +1628,7 @@ bc_options(Config) ->
 
 highest_opcode(DataDir, Mod, Opt) ->
     Src = filename:join(DataDir, atom_to_list(Mod)++".erl"),
-    {ok,Mod,Beam} = compile:file(Src, [binary|Opt]),
+    {ok,Mod,Beam} = compile:file(Src, [binary,report_errors|Opt]),
     test_lib:highest_opcode(Beam).
 
 deterministic_include(Config) when is_list(Config) ->
diff --git a/lib/compiler/test/compile_SUITE_data/funs.erl b/lib/compiler/test/compile_SUITE_data/funs.erl
new file mode 100644
index 0000000000..d605128ef4
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/funs.erl
@@ -0,0 +1,8 @@
+-module(funs).
+-export([go/0]).
+
+go() ->
+    Id = id(fun id/1),
+    {Id(ok), Id(42)}.
+
+id(I) -> I.
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index cca81d70f7..8a6071e71f 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -118,7 +118,6 @@ get_data_dir(Config) ->
                 "_no_copt_SUITE",
                 "_post_opt_SUITE",
                 "_inline_SUITE",
-                "_r21_SUITE",
                 "_no_module_opt_SUITE",
                 "_no_type_opt_SUITE",
                 "_no_ssa_opt_SUITE"],
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 1a88c70963..a5fce3ad32 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -23,7 +23,7 @@
 -module(kernel_SUITE).
 -include_lib("common_test/include/ct.hrl").
 
--compile(r21).
+-compile(r22).
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index 506ea7bbec..64fd4c52ac 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -19,9 +19,6 @@
 %%
 -module(seq_trace_SUITE).
 
-%% label_capability_mismatch needs to run a part of the test on an OTP 20 node.
--compile(r20).
-
 -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]).
@@ -30,7 +27,7 @@
 	 send/1, distributed_send/1, recv/1, distributed_recv/1,
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
          port_clean_token/1,
-	 match_set_seq_token/1, gc_seq_token/1, label_capability_mismatch/1,
+	 match_set_seq_token/1, gc_seq_token/1,
          send_literal/1,inherit_on_spawn/1,inherit_on_dist_spawn/1,
          dist_spawn_error/1]).
 
@@ -57,7 +54,7 @@ all() ->
      old_heap_token, mature_heap_token,
      distributed_exit, call, port, match_set_seq_token,
      port_clean_token,
-     gc_seq_token, label_capability_mismatch,
+     gc_seq_token,
      inherit_on_spawn, inherit_on_dist_spawn, dist_spawn_error].
 
 groups() -> 
@@ -417,74 +414,6 @@ do_distributed_exit(TsType) ->
 		{'EXIT', Receiver, {exit, {before, exit}}}}, Ts}] = Result,
     check_ts(TsType, Ts).
 
-label_capability_mismatch(Config) when is_list(Config) ->
-    Releases = ["20_latest"],
-    Available = [Rel || Rel <- Releases, test_server:is_release_available(Rel)],
-    case Available of
-        [] -> {skipped, "No incompatible releases available"};
-        _ ->
-            lists:foreach(fun do_incompatible_labels/1, Available),
-            lists:foreach(fun do_compatible_labels/1, Available),
-            ok
-    end.
-
-do_incompatible_labels(Rel) ->
-    Cookie = atom_to_list(erlang:get_cookie()),
-    {ok, Node} = test_server:start_node(
-        list_to_atom(atom_to_list(?MODULE)++"_"++Rel), peer,
-        [{args, " -setcookie "++Cookie}, {erl, [{release, Rel}]}]),
-
-    {_,Dir} = code:is_loaded(?MODULE),
-    Mdir = filename:dirname(Dir),
-    true = rpc:call(Node,code,add_patha,[Mdir]),
-    seq_trace:reset_trace(),
-    true = is_pid(rpc:call(Node,?MODULE,start_tracer,[])),
-    Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
-
-    %% This node does not support arbitrary labels, so it must fail with a
-    %% timeout as the token is dropped silently.
-    seq_trace:set_token(label,make_ref()),
-    seq_trace:set_token('receive',true),
-
-    Receiver ! 'receive',
-    %% let the other process receive the message:
-    receive after 10 -> ok end,
-    seq_trace:reset_trace(),
-
-    {error,timeout} = rpc:call(Node,?MODULE,stop_tracer,[1]),
-    stop_node(Node),
-    ok.
-
-do_compatible_labels(Rel) ->
-    Cookie = atom_to_list(erlang:get_cookie()),
-    {ok, Node} = test_server:start_node(
-        list_to_atom(atom_to_list(?MODULE)++"_"++Rel), peer,
-        [{args, " -setcookie "++Cookie}, {erl, [{release, Rel}]}]),
-
-    {_,Dir} = code:is_loaded(?MODULE),
-    Mdir = filename:dirname(Dir),
-    true = rpc:call(Node,code,add_patha,[Mdir]),
-    seq_trace:reset_trace(),
-    true = is_pid(rpc:call(Node,?MODULE,start_tracer,[])),
-    Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
-
-    %% This node does not support arbitrary labels, but small integers should
-    %% still work.
-    Label = 1234,
-    seq_trace:set_token(label,Label),
-    seq_trace:set_token('receive',true),
-
-    Receiver ! 'receive',
-    %% let the other process receive the message:
-    receive after 10 -> ok end,
-    Self = self(),
-    seq_trace:reset_trace(),
-    Result = rpc:call(Node,?MODULE,stop_tracer,[1]),
-    stop_node(Node),
-    ok = io:format("~p~n",[Result]),
-    [{Label,{'receive',_,Self,Receiver,'receive'}, _}] = Result,
-    ok.
-
 call(doc) -> 
     "Tests special forms {is_seq_trace} and {get_seq_token} "
 	"in trace match specs.";
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index cb1e1fba8a..d94c4e5370 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -25,7 +25,7 @@
          dump_persistent_terms/0,
          create_persistent_terms/0,
          dump_global_literals/0]).
--compile(r20).
+-compile(r22).
 -include_lib("common_test/include/ct.hrl").
 
 n1_proc(N2,Creator) ->
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index 950ac0320d..dfb2199771 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -32,7 +32,7 @@
 	 log_file/1,
 	 utc_log/1]).
 
--compile(r21).
+-compile(r22).
 
 all() -> 
     [log_mf_h_env, log_file, app_test, appup_test, utc_log].
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index 56232dd5ec..2b9226dbc2 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -85,7 +85,6 @@ normal(Conf) when is_list(Conf) ->
     P0 = pps(),
 
     do_normal(Source, PrivDir, BeamFile, []),
-    do_normal(Source, PrivDir, BeamFile, [no_utf8_atoms]),
 
     {ok,_} = compile:file(Source, [{outdir,PrivDir}, no_debug_info]),
     {ok, {simple, [{debug_info, {debug_info_v1, erl_abstract_code, {none, _}}}]}} =
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 7e05723036..b30974cd0f 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -27,7 +27,7 @@
          init_per_testcase/2, end_per_testcase/2,
          app_test/1, appup_test/1, assert_test/1]).
 
--compile(r21).
+-compile(r22).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-- 
2.31.1

Places

File 1281-Stop-using-the-r18-r19-r20-and-r21-options.patch of Package erlang (Revision c584b326f39066625edf7d62736599b6)

Places