Merge pull request #8610 from bjorng/bjorn/remove-otp-24-support

Remove support for running OTP 24 code
erlang · Jun 27, 2024 · 0b075ec · 0b075ec
2 parents 7aa225e + 08182e9
commit 0b075ec
Show file tree

Hide file tree

Showing 46 changed files with 69 additions and 3,189 deletions.
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
@@ -690,15 +690,6 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
                     print_byte_string(to, to_arg, str, bytes);
                 }
                 break;
-	    case op_bs_put_string_WW:
-                if (ap - first_arg == 0) {
-                    erts_print(to, to_arg, "%d", *ap);
-                } else {
-                    Uint bytes = ap[-1];
-                    byte* str = (byte *) ap[0];
-                    print_byte_string(to, to_arg, str, bytes);
-                }
-                break;
 	    default:
 #ifdef ARCH_64
 		erts_print(to, to_arg, "%ld", *ap);

diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
@@ -194,8 +194,13 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
          *
          * We know that because OTP 23/24/25/26 artifically set the
          * highest used op code to the op code for the `swap`
-         * instruction introduced in OTP 23. (OTP 27 artificially sets
-         * the highest op code to `make_fun3` introduced in OTP 24.)
+         * instruction introduced in OTP 23.
+         *
+         * OTP 27 artificially sets the highest op code to `make_fun3`
+         * introduced in OTP 24.
+         *
+         * OTP 28 artificially sets the highest op code to `bs_create_bin`
+         * introduced in OTP 25.
          *
          * Old BEAM files produced by OTP R12 and earlier may be
          * incompatible with the current runtime system. We used to
@@ -207,7 +212,7 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
                        "This BEAM file was compiled for an old version of "
                        "the runtime system.\n"
                        "  To fix this, please re-compile this module with "
-                       "Erlang/OTP 24 or later.\n");
+                       "Erlang/OTP 25 or later.\n");
     }
 
     if (!load_code(stp)) {

diff --git a/erts/emulator/beam/emu/beam_emu.c b/erts/emulator/beam/emu/beam_emu.c
@@ -320,8 +320,6 @@ void process_main(ErtsSchedulerData *esdp)
 
     ERTS_MSACC_DECLARE_CACHE_X() /* a cached value of the tsd pointer for msacc */
 
-    ERL_BITS_DECLARE_STATEP; /* Has to be last declaration */
-
     /*
      * Note: In this function, we attempt to place rarely executed code towards
      * the end of the function, in the hope that the cache hit rate will be better.
@@ -379,7 +377,6 @@ void process_main(ErtsSchedulerData *esdp)
 	start_time_i = c_p->i;
     }
 
-    ERL_BITS_RELOAD_STATEP(c_p);
     {
 	int reds;
 	BeamInstr next;