Turn off more optimizations for no_opt modules

With the new compiler in OTP 22, we have to use more options to
turn off optimizations.

This commit also skips the match_huge_int/1 test case in the
unoptimized clone of the bs_match_int module because it could
crash on memory-constrained computers.

2 files changed, 45 insertions, 30 deletions

diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 28775b6f02..03bd4dd9a8 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -213,8 +213,8 @@ make_emakefile: $(NO_OPT_ERL_FILES) $(NATIVE_ERL_FILES)
 	'*_SUITE_make' > $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) +compressed -o$(EBIN) \
 	$(MODULES) >> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt $(ERL_COMPILE_FLAGS) \
-	-o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt +no_ssa_opt +no_bsm_opt \
+        $(ERL_COMPILE_FLAGS) -o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +native $(ERL_COMPILE_FLAGS) \
 	-o$(EBIN) $(NATIVE_MODULES) >> $(EMAKEFILE)
 
diff --git a/erts/emulator/test/bs_match_int_SUITE.erl b/erts/emulator/test/bs_match_int_SUITE.erl
index e913dc98b0..454e55d017 100644
--- a/erts/emulator/test/bs_match_int_SUITE.erl
+++ b/erts/emulator/test/bs_match_int_SUITE.erl
@@ -234,34 +234,49 @@ mml_choose(<<_A:8>>) -> single_byte_binary;
 mml_choose(<<_A:8,_T/binary>>) -> multi_byte_binary.
 
 match_huge_int(Config) when is_list(Config) ->
-    Sz = 1 bsl 27,
-    Bin = <<0:Sz,13:8>>,
-    skip_huge_int_1(Sz, Bin),
-    0 = match_huge_int_1(Sz, Bin),
-
-    %% Test overflowing the size of an integer field.
-    nomatch = overflow_huge_int_skip_32(Bin),
-    case erlang:system_info(wordsize) of
-	4 ->
-	    nomatch = overflow_huge_int_32(Bin);
-	8 ->
-	    %% An attempt will be made to allocate heap space for
-	    %% the bignum (which will probably fail); only if the
-	    %% allocation succeeds will the matching fail because
-	    %% the binary is too small.
-	    ok
-    end,
-    nomatch = overflow_huge_int_skip_64(Bin),
-    nomatch = overflow_huge_int_64(Bin),
-
-    %% Test overflowing the size of an integer field using variables as sizes.
-    Sizes = case erlang:system_info(wordsize) of
-		      4 -> lists:seq(25, 32);
-		      8 -> []
-		  end ++ lists:seq(50, 64),
-    ok = overflow_huge_int_unit128(Bin, Sizes),
-
-    ok.
+    case ?MODULE of
+        bs_match_int_no_opt_SUITE ->
+            %% This test case is written with the assumption that
+            %% bs_skip2 instructions are used when the value of the
+            %% extracted segment will not be used. In OTP 21 and earlier, that
+            %% assumption was always true, because the bs_skip optimization
+            %% was included in v3_codegen and could not be disabled.
+            %% In OTP 22, the bs_skip optimization is done by beam_ssa_opt
+            %% and is disabled.
+            %%
+            %% On memory-constrained computers, using bs_get_integer2
+            %% instructions may cause the runtime system to terminate
+            %% because of insufficient memory.
+            {skip, "unoptimized code would use too much memory"};
+        bs_match_int_SUITE ->
+            Sz = 1 bsl 27,
+            Bin = <<0:Sz,13:8>>,
+            skip_huge_int_1(Sz, Bin),
+            0 = match_huge_int_1(Sz, Bin),
+
+            %% Test overflowing the size of an integer field.
+            nomatch = overflow_huge_int_skip_32(Bin),
+            case erlang:system_info(wordsize) of
+                4 ->
+                    nomatch = overflow_huge_int_32(Bin);
+                8 ->
+                    %% An attempt will be made to allocate heap space for
+                    %% the bignum (which will probably fail); only if the
+                    %% allocation succeeds will the matching fail because
+                    %% the binary is too small.
+                    ok
+            end,
+            nomatch = overflow_huge_int_skip_64(Bin),
+            nomatch = overflow_huge_int_64(Bin),
+
+            %% Test overflowing the size of an integer field using
+            %% variables as sizes.
+            Sizes = case erlang:system_info(wordsize) of
+                        4 -> lists:seq(25, 32);
+                        8 -> []
+                    end ++ lists:seq(50, 64),
+            ok = overflow_huge_int_unit128(Bin, Sizes)
+    end.
 
 overflow_huge_int_unit128(Bin, [Sz0|Sizes]) ->
     Sz = id(1 bsl Sz0),