Merge branch 'maint'

* maint:
  compiler: Eliminate internal error in sub pass ssa_opt_bsm_shortcut
  Eliminate Dialyzer crash for ill-typed code
  compile_SUITE: Make core_roundtrip/1 less resource-intensive
  compile_SUITE: Avoid eaccess error during cleanup on Windows
  asn1, compiler: Avoid running out of memory on Windows
  Fix filelib_SUITE:ensure_path_invalid_path/1

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 0a331d0dd0..d421c29dd3 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -306,7 +306,14 @@ ber_get_len(<<1:1,Octets:7,T0/binary>>) ->
 %%  Will fail the test case if there were any errors.
 
 p_run(Test, List) ->
-    S = erlang:system_info(schedulers),
+    %% Limit the number of parallel processes to avoid running out of
+    %% memory.
+    S = case {erlang:system_info(schedulers),erlang:system_info(wordsize)} of
+            {S0,4} ->
+                min(S0, 2);
+            {S0,_} ->
+                min(S0, 8)
+        end,
     N = case test_server:is_cover() of
 	    false ->
 		S + 1;