stdlib: Add query optimisation to ets:fun2ms/1

.github/dockerfiles/Dockerfile.clang

@@ -9,7 +9,7 @@ ENV MAKEFLAGS=$MAKEFLAGS \
     ERL_TOP=/buildroot/otp \
     PATH=/otp/bin:/buildroot/otp/bin:$PATH
 
-RUN sudo apt-get install -y clang
+RUN sudo apt-get update && sudo apt-get install -y clang
 
 ARG ARCHIVE=./otp.tar.gz
 COPY $ARCHIVE /buildroot/otp.tar.gz

.github/dockerfiles/Dockerfile.ubuntu-base

@@ -66,11 +66,12 @@ RUN apt-get install -y git curl && \
 ARG EXTRA_LIBS="erlang erlang-doc"
 RUN apt-get install -y \
     unixodbc odbc-postgresql postgresql ssh openssh-server groff-base gdb \
-    tinyproxy bind9 nsd expect vsftpd python emacs nano vim \
-    linux-tools-common linux-tools-generic linux-tools-`uname -r` jq \
+    tinyproxy knot ldnsutils expect vsftpd python emacs nano vim \
+    linux-tools-common linux-tools-generic jq \
     xvfb libgl1-mesa-dri && \
     for lib in ${EXTRA_LIBS}; do apt-get install -y ${lib}; done && \
     if [ ! -f /etc/apache2/apache2.conf ]; then apt-get install -y apache2; fi
+RUN apt-get install -y linux-tools-$(uname -r) || true
 
 ## We use tmux to test terminals
 RUN apt-get install -y libevent-dev libutf8proc-dev && \

.github/dockerfiles/init.sh

@@ -10,7 +10,8 @@ sudo /usr/sbin/sshd
 
 sudo service postgresql start
 
-sudo -E bash -c "apt-get update && apt-get install -y linux-tools-common linux-tools-generic linux-tools-`uname -r`"
+sudo -E bash -c "apt-get update && apt-get install -y linux-tools-common linux-tools-generic"
+sudo -E bash -c "apt-get install -y linux-tools-$(uname-r)" || true
 
 sudo bash -c "Xvfb :99 -ac -screen 0 1920x1080x24 -nolisten tcp" &
 export DISPLAY=:99

.github/scripts/build-base-image.sh

@@ -12,6 +12,10 @@ esac
 
 if [ -z "${BASE_TAG}" ]; then
     BASE_TAG=$(grep "ARG BASE=" ".github/dockerfiles/Dockerfile.${2}" | head -1 | tr '=' ' ' | awk '{print $3}')
+    ## If this script is used on pre 25 releases
+    if [ -z "${BASE_TAG}" ]; then
+        BASE_TAG=$(grep "FROM " ".github/dockerfiles/Dockerfile.${2}" | head -1 | awk '{print $2}')
+    fi
 fi
 
 case "${BASE_TAG}" in

.github/scripts/restore-from-prebuilt.sh

@@ -33,7 +33,7 @@ if [ -z "${CONFIGURE}" ] || [ "${CONFIGURE}" = "false" ]; then
 fi
 
 ## If bootstrap has been changed, we do not use the cached .beam files
-EXCLUDE_BOOTSTRAP=""
+EXCLUDE_BOOTSTRAP=()
 if [ "${BOOTSTRAP}" = "true" ]; then
     find "${CACHE_DIR}/otp/lib" -name "*.beam" -exec rm -f {} \;
 else

.github/scripts/sync-github-prs.es

@@ -5,9 +5,14 @@
 %% into the Target folder. It tries its best to not create too large
 %% files so that gh will still be happy with us when this is published to
 %% gh pages
+-module('sync-github-prs').
 -mode(compile).
 
 main([Repo, Target]) ->
+
+    io:format("Updating PRs in ~ts, current PRs are: ~p~n",
+              [Target, filelib:wildcard(filename:join(Target,"*"))]),
+
     AllOpenPrs = ghapi("gh api --paginate -X GET /repos/"++Repo++"/pulls -f state=open"),
     %% Download all updates, there really should not be any to download as they
     %% are updated when a PR is updated, but we do it anyways just to be safe.
@@ -26,7 +31,10 @@ main([Repo, Target]) ->
                   false ->
                       cmd("rm -rf " ++ filename:join(Target,PRNo))
               end
-      end, AllPrs);
+      end, AllPrs),
+
+    purge_prs(Target);
+
 main([Repo, Target, PRNo]) ->
     handle_prs(Repo, Target, [ghapi("gh api /repos/"++Repo++"/pulls/"++PRNo)]).
 
@@ -68,6 +76,9 @@ handle_pr(_Repo, Target,
             io:format("Checking for ~ts~n", [filename:join(PRDir, Ident)]),
             case file:read_file_info(filename:join(PRDir, Ident)) of
                 {error, enoent} ->
+                    io:format("Did not find ~ts. Files in dir are: ~p~n",
+                              [filename:join(PRDir, Ident),
+                               filelib:wildcard(filename:join(PRDir, "*"))]),
                     cmd("rm -rf "++PRDir),
                     ok = file:make_dir(PRDir),
                     ok = file:write_file(filename:join(PRDir,Ident), integer_to_list(Number)),
@@ -154,6 +165,30 @@ purge_suite(SuiteFilePath) ->
               end, filelib:wildcard(filename:join(SuiteDir,"*.html")))
     end.
 
+%% If we have more the 10 GB of PR data we need to remove some otherwise
+%% github actions will not work them. So we purge the largest files until we
+%% reach the 10 GB limit.
+purge_prs(Target) ->
+    %% Start by deleting all data from common_test test runs as they are huge.
+    os:cmd("rm -rf "++Target++"*/ct_logs/ct_run*/*common_test_test*/run*/log_private/ct_run*"),
+    Files = string:split(cmd("find " ++ Target ++ " -type f -a -name \! suite.log.html -exec du -a {} \+"),"\n",all),
+    SortedFiles =
+        lists:sort(fun([A|_]=As,[B|_]=Bs) ->
+                               binary_to_integer(A) >= binary_to_integer(B)
+                   end, [string:split(F,"\t") || F <- Files, F =/= <<>>]),
+    purge_prs(SortedFiles, Target, get_directory_size(Target)).
+purge_prs(Files, Target, Size) when Size > 10_000_000_000 ->
+    {H,T} = lists:split(10, Files),
+    [file:write_file(File, io_lib:format("Large file (~p bytes) truncated", [Sz]))
+     || [Sz, File] <- H],
+    purge_prs(T, Target, get_directory_size(Target));
+purge_prs(_, _, _) ->
+    ok.
+
+get_directory_size(Dir) ->
+    binary_to_integer(hd(string:split(cmd("du -b --max-depth=0 " ++ Dir),"\t"))).
+
+
 ghapi(CMD) ->
     decode(cmd(CMD)).
 

.github/scripts/sync-github-releases.sh

@@ -211,37 +211,40 @@ if [ ${UPLOADED} = true ]; then
 fi
 
 ## If no assets were uploaded, we try to build one instead
-if [ ${UPLOADED} = false ] && [ ${#MISSING_PREBUILD[0]} != 0 ]; then
-    name="${MISSING_PREBUILD[0]}"
-    stripped_name=$(_strip_name "${name}")
-    git clone https://github.com/erlang/otp -b "${name}" otp_src
-    if [ -f otp_src/.github/scripts/init-pre-release.sh ]; then
-        (cd otp_src && ERL_TOP=$(pwd) .github/scripts/init-pre-release.sh)
-    else
-        (cd otp_src && ERL_TOP=$(pwd) ../.github/scripts/init-pre-release.sh)
-    fi
-    case ${stripped_name} in
-        23.**)
-            ## The 32-bit dockerfile build the doc chunks which we want
-            ## to include in VSN >= 23.
-            docker build -t otp --build-arg ARCHIVE=otp_src/otp_src.tar.gz \
-                   -f otp_src/.github/dockerfiles/Dockerfile.32-bit .
-            ;;
-        *)
-            docker build -t otp --build-arg ARCHIVE=otp_src/otp_src.tar.gz \
-                   -f otp_src/.github/dockerfiles/Dockerfile.64-bit .
-            ;;
-    esac
-    docker run -v "$PWD":/github otp \
-           "/github/scripts/build-otp-tar -o /github/otp_clean_src.tar.gz /github/otp_src.tar.gz -b /buildroot/otp/ /buildroot/otp.tar.gz"
-    .github/scripts/release-docs.sh
-    .github/scripts/create-artifacts.sh downloads "${name}"
-
-    ## Delete any artifacts that we should not upload
-    for artifact in dowloads/*; do
-        if ! echo "${RI[@]}" | grep "${artifact}" 2> /dev/null > /dev/null; then
-            rm -f "downloads/${artifact}"
+if [ ${UPLOADED} = false ]; then
+    for name in "${MISSING_PREBUILD[@]}"; do
+        stripped_name=$(_strip_name "${name}")
+        release=$(echo "${stripped_name}" | awk -F. '{print $1}')
+        if [[ $release < 24 ]]; then
+            ## Releases before 24 are no longer supported and are a bit different
+            ## from 24+ so I've removed support for them
+            echo "Skipping old release ${name}"
+            continue;
+        fi
+        echo "Building pre-build and docs for ${name}"
+        git clone https://github.com/erlang/otp -b "${name}" otp_src
+        if [ -f otp_src/.github/scripts/init-pre-release.sh ]; then
+            (cd otp_src && ERL_TOP=$(pwd) .github/scripts/init-pre-release.sh)
+        else
+            (cd otp_src && ERL_TOP=$(pwd) ../.github/scripts/init-pre-release.sh)
         fi
+        (cd otp_src && BASE_USE_CACHE=false GITHUB_OUTPUT=.tmp ../.github/scripts/build-base-image.sh maint-${release} 64-bit)
+        docker build -t otp --build-arg ARCHIVE=otp_src/otp_src.tar.gz \
+               -f otp_src/.github/dockerfiles/Dockerfile.64-bit .
+        docker run -v "$PWD":/github otp \
+               "/github/scripts/build-otp-tar -o /github/otp_clean_src.tar.gz /github/otp_src.tar.gz -b /buildroot/otp/ /buildroot/otp.tar.gz"
+        .github/scripts/release-docs.sh
+        .github/scripts/create-artifacts.sh downloads "${name}"
+
+        ## Delete any artifacts that we should not upload
+        for artifact in dowloads/*; do
+            if ! echo "${RI[@]}" | grep "${artifact}" 2> /dev/null > /dev/null; then
+                rm -f "downloads/${artifact}"
+            fi
+        done
+        _upload_artifacts "${name}"
+
+        ## We only update one release per call to sync-github-releases
+        break
     done
-    _upload_artifacts "${name}"
 fi

.github/workflows/main.yaml

@@ -299,7 +299,12 @@ jobs:
           export ERTS_SKIP_DEPEND=true
           eval `./otp_build env_win32 x64`
           ./otp_build configure
-          if cat erts/CONF_INFO || cat lib/*/CONF_INFO || cat lib/*/SKIP || cat lib/SKIP-APPLICATIONS; then exit 1; fi
+          if cat erts/CONF_INFO ||
+             grep -v "Static linking with OpenSSL 3.0" lib/*/CONF_INFO ||
+             cat lib/*/SKIP ||
+             cat lib/SKIP-APPLICATIONS; then
+             exit 1
+          fi
           ./otp_build boot -a
           ./otp_build release -a
           cp /mnt/c/opt/local64/pgm/wxWidgets-${{ env.WXWIDGETS_VERSION }}/3rdparty/webview2/runtimes/win-x64/native/WebView2Loader.dll $ERL_TOP/release/win32/erts-*/bin/
@@ -384,6 +389,14 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Cleanup GH Runner
+        run: |
+            ## Delete large files from runner to get more disk space
+            ## See https://github.com/actions/runner-images/issues/2840
+            sudo rm -rf /usr/share/dotnet
+            sudo rm -rf /opt/ghc
+            sudo rm -rf "/usr/local/share/boost"
+            sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - name: Cache BASE image
         uses: actions/cache@v3
         if: matrix.type == 'clang'
@@ -582,6 +595,7 @@ jobs:
             -e TEST_NEEDS_RELEASE=true -e "RELEASE_ROOT=/buildroot/otp/Erlang ∅⊤℞" \
             -e EXTRA_ARGS="-ct_hooks cth_surefire [{path,\"/buildroot/otp/$DIR/make_test_dir/${{ matrix.type }}_junit.xml\"}]" \
             -v "$PWD/make_test_dir:/buildroot/otp/$DIR/make_test_dir" \
+            -v "$PWD/scripts:/buildroot/otp/scripts" \
             otp "make TYPE=${TYPE} && make ${APP}_test TYPE=${TYPE}"
           ## Rename os_mon to debug for debug build
           if [ "$APP" != "${{ matrix.type }}" ]; then

.github/workflows/sync-github-releases.yaml

@@ -32,12 +32,12 @@ jobs:
     concurrency: erlang.github.io-deploy
     runs-on: ubuntu-20.04
     steps:
+      - uses: actions/checkout@v3
       - uses: actions/checkout@v3
         with:
           token: ${{ secrets.ERLANG_TOKEN }}
           repository: 'erlang/erlang.github.io'
           path: erlang.github.io
-      - uses: actions/checkout@v3
       - name: Update PRs
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

CONTRIBUTING.md

@@ -154,7 +154,7 @@ If you want to change the setting only for the Erlang mode, you can use a hook l
 ### After you have submitted your pull request
 
 * Follow the discussion following your pull request, answer questions, discuss and implement
-changes requested by reviewers.
+changes requested by reviewers. Smaller changes should be squashed into their associated commits.
 
 * If your pull requests introduces new public functions, they need to be tagged with the
 OTP release in which they _will_ appear in the `since` tag in the functions' documentation.

HOWTO/DTRACE.md

@@ -52,5 +52,5 @@ DTrace probe specifications
 Probe specifications can be found in `erts/emulator/beam/erlang_dtrace.d`, and
 a few example scripts can be found under `lib/runtime_tools/examples/`.
 
-   [1]: http://www.erlang.org/euc/08/
+   [1]: https://erlang.org/euc/08/
    [$ERL_TOP/HOWTO/SYSTEMTAP.md]: SYSTEMTAP.md

bootstrap/lib/compiler/ebin/compiler.app

@@ -1,7 +1,7 @@
 % This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2022. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2023. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,32 +19,35 @@
 
 {application, compiler,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "8.2.2"},
+  {vsn, "8.3.2"},
   {modules, [
 	     beam_a,
 	     beam_asm,
              beam_bounds,
 	     beam_block,
              beam_call_types,
 	     beam_clean,
+	     beam_core_to_ssa,
 	     beam_dict,
 	     beam_digraph,
 	     beam_disasm,
 	     beam_flatten,
 	     beam_jump,
-             beam_kernel_to_ssa,
 	     beam_listing,
 	     beam_opcodes,
              beam_ssa,
+             beam_ssa_alias,
              beam_ssa_bc_size,
              beam_ssa_bool,
              beam_ssa_bsm,
+             beam_ssa_check,
              beam_ssa_codegen,
              beam_ssa_dead,
              beam_ssa_lint,
              beam_ssa_opt,
              beam_ssa_pp,
              beam_ssa_pre_codegen,
+             beam_ssa_private_append,
              beam_ssa_recv,
              beam_ssa_share,
              beam_ssa_throw,
@@ -74,12 +77,10 @@
 	     sys_core_prepare,
 	     sys_messages,
 	     sys_pre_attributes,
-	     v3_core,
-	     v3_kernel,
-	     v3_kernel_pp
+	     v3_core
 	    ]},
   {registered, []},
   {applications, [kernel, stdlib]},
   {env, []},
-  {runtime_dependencies, ["stdlib-4.0","kernel-8.4","erts-13.0",
+  {runtime_dependencies, ["stdlib-5.0","kernel-8.4","erts-13.0",
 			  "crypto-5.1"]}]}.

bootstrap/lib/kernel/ebin/kernel.app

@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2023. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 {application, kernel,
  [
   {description, "ERTS  CXC 138 10"},
-  {vsn, "8.5.2"},
+  {vsn, "9.0.2"},
   {modules, [application,
 	     application_controller,
 	     application_master,
@@ -55,6 +55,8 @@
 	     inet6_udp,
 	     inet6_sctp,
 	     inet_config,
+             inet_epmd_dist,
+             inet_epmd_socket,
 	     inet_hosts,
 	     inet_gethost_native,
 	     inet_tcp_dist,
@@ -102,6 +104,7 @@
              inet,
              inet_db,
              inet_dns,
+             inet_dns_tsig,
              inet_parse,
              inet_res,
              inet_tcp,
@@ -158,7 +161,7 @@
          {shell_docs_ansi,auto}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-@OTP-18248@", "stdlib-@OTP-17932@",
+  {runtime_dependencies, ["erts-14.0", "stdlib-5.0",
                           "sasl-3.0", "crypto-5.0"]}
   ]
 }.

bootstrap/lib/stdlib/ebin/stdlib.app

@@ -2,7 +2,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2023. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@
 %%
 {application, stdlib,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "4.2"},
-  {modules, [array,
+  {vsn, "5.0.2"},
+  {modules, [argparse,
+	     array,
 	     base64,
 	     beam_lib,
 	     binary,
@@ -114,6 +115,6 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-@OTP-17932@","erts-13.1","crypto-4.5",
+  {runtime_dependencies, ["sasl-3.0","kernel-9.0","erts-13.1","crypto-4.5",
 			  "compiler-5.0"]}
 ]}.