File 1202-Remove-support-for-BEAM-files-compiled-bef... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1202-Remove-support-for-BEAM-files-compiled-before-OTP-22.patch of Package erlang (Revision bb9db9e8521e01495e35a8b04e76808f)

Currently displaying revision bb9db9e8521e01495e35a8b04e76808f , Show latest

From c7ddbcbe7d95a0dee3d0610ce7d73ebe53c23cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 22 Sep 2021 14:09:17 +0200
Subject: [PATCH 2/2] Remove support for BEAM files compiled before OTP 22

Keeping compatibility with OTP 21 and earlier would complicate some
of the things we are planning to do in OTP 25.
---
 erts/emulator/beam/beam_file.c            |  32 +---
 erts/emulator/beam/beam_file.h            |   4 -
 erts/emulator/beam/beam_load.c            |   2 -
 erts/emulator/beam/emu/bs_instrs.tab      | 119 --------------
 erts/emulator/beam/emu/map_instrs.tab     |   8 -
 erts/emulator/beam/emu/ops.tab            |  76 +--------
 erts/emulator/beam/emu/predicates.tab     |   9 +
 erts/emulator/beam/generators.tab         |  65 --------
 erts/emulator/beam/jit/arm/instr_bs.cpp   |  60 -------
 erts/emulator/beam/jit/arm/instr_map.cpp  |  22 ---
 erts/emulator/beam/jit/arm/ops.tab        |  71 +-------
 erts/emulator/beam/jit/load.h             |   2 -
 erts/emulator/beam/jit/x86/instr_bs.cpp   |  58 -------
 erts/emulator/beam/jit/x86/instr_map.cpp  |  21 ---
 erts/emulator/beam/jit/x86/ops.tab        |  70 +-------
 erts/emulator/beam/predicates.tab         |  13 --
 lib/compiler/src/beam_asm.erl             |  14 +-
 lib/compiler/src/beam_block.erl           |   2 -
 lib/compiler/src/beam_dict.erl            |   8 +-
 lib/compiler/src/beam_flatten.erl         |   2 -
 lib/compiler/src/beam_ssa_codegen.erl     |  33 +---
 lib/compiler/src/beam_ssa_pre_codegen.erl | 191 +---------------------
 lib/compiler/src/beam_validator.erl       |  41 -----
 lib/compiler/src/beam_z.erl               |  26 +--
 lib/compiler/src/compile.erl              |  49 ++++--
 lib/compiler/src/genop.tab                |  12 +-
 26 files changed, 96 insertions(+), 914 deletions(-)

diff --git a/erts/emulator/beam/beam_file.c b/erts/emulator/beam/beam_file.c
index 6c870d594a..c5f849ae3f 100644
--- a/erts/emulator/beam/beam_file.c
+++ b/erts/emulator/beam/beam_file.c
@@ -233,7 +233,6 @@ static int beamreader_read_tagged(BeamReader *reader, TaggedNumber *val) {
 }
 
 static int parse_atom_chunk(BeamFile *beam,
-                            ErtsAtomEncoding enc,
                             IFF_Chunk *chunk) {
     BeamFile_AtomTable *atoms;
     BeamReader reader;
@@ -258,7 +257,6 @@ static int parse_atom_chunk(BeamFile *beam,
     atoms->entries = erts_alloc(ERTS_ALC_T_PREPARED_CODE,
                                 count * sizeof(atoms->entries[0]));
     atoms->entries[0] = THE_NON_VALUE;
-    atoms->encoding = enc;
     atoms->count = count;
 
     for (i = 1; i < count; i++) {
@@ -269,7 +267,7 @@ static int parse_atom_chunk(BeamFile *beam,
         LoadAssert(beamreader_read_u8(&reader, &length));
         LoadAssert(beamreader_read_bytes(&reader, length, &string));
 
-        atom = erts_atom_put(string, length, enc, 1);
+        atom = erts_atom_put(string, length, ERTS_ATOM_ENC_UTF8, 1);
         LoadAssert(atom != THE_NON_VALUE);
 
         atoms->entries[i] = atom;
@@ -738,7 +736,7 @@ static int read_beam_chunks(const IFF_File *file,
 enum beamfile_read_result
 beamfile_read(const byte *data, size_t size, BeamFile *beam) {
     static const Uint chunk_iffs[] = {
-        MakeIffId('A', 't', 'o', 'm'), /* 0 */
+        MakeIffId('A', 't', 'U', '8'), /* 0 */
         MakeIffId('C', 'o', 'd', 'e'), /* 1 */
         MakeIffId('S', 't', 'r', 'T'), /* 2 */
         MakeIffId('I', 'm', 'p', 'T'), /* 3 */
@@ -748,11 +746,10 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
         MakeIffId('A', 't', 't', 'r'), /* 7 */
         MakeIffId('C', 'I', 'n', 'f'), /* 8 */
         MakeIffId('L', 'i', 'n', 'e'), /* 9 */
-        MakeIffId('A', 't', 'U', '8'), /* 10 */
-        MakeIffId('L', 'o', 'c', 'T'), /* 11 */
+        MakeIffId('L', 'o', 'c', 'T'), /* 10 */
     };
 
-    static const int ATOM_CHUNK = 0;
+    static const int UTF8_ATOM_CHUNK = 0;
     static const int CODE_CHUNK = 1;
     static const int STR_CHUNK = 2;
     static const int IMP_CHUNK = 3;
@@ -762,9 +759,8 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
     static const int ATTR_CHUNK = 7;
     static const int COMPILE_CHUNK = 8;
     static const int LINE_CHUNK = 9;
-    static const int UTF8_ATOM_CHUNK = 10;
 #ifdef BEAMASM
-    static const int LOC_CHUNK = 11;
+    static const int LOC_CHUNK = 10;
 #endif
 
     static const int NUM_CHUNKS = sizeof(chunk_iffs) / sizeof(chunk_iffs[0]);
@@ -773,8 +769,6 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
 
     /* MSVC doesn't like the use of NUM_CHUNKS here */
     IFF_Chunk chunks[sizeof(chunk_iffs) / sizeof(chunk_iffs[0])];
-    IFF_Chunk *atom_chunk;
-    ErtsAtomEncoding enc;
 
     sys_memset(beam, 0, sizeof(*beam));
 
@@ -796,18 +790,10 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
         goto error;
     }
 
-    if (chunks[UTF8_ATOM_CHUNK].size > 0) {
-        atom_chunk = &chunks[UTF8_ATOM_CHUNK];
-        enc = ERTS_ATOM_ENC_UTF8;
-    } else if (chunks[ATOM_CHUNK].size > 0) {
-        atom_chunk = &chunks[ATOM_CHUNK];
-        enc = ERTS_ATOM_ENC_LATIN1;
-    } else {
+    if (chunks[UTF8_ATOM_CHUNK].size == 0) {
         error = BEAMFILE_READ_MISSING_ATOM_TABLE;
         goto error;
-    }
-
-    if (!parse_atom_chunk(beam, enc, atom_chunk)) {
+    } else if (!parse_atom_chunk(beam, &chunks[UTF8_ATOM_CHUNK])) {
         error = BEAMFILE_READ_CORRUPT_ATOM_TABLE;
         goto error;
     }
@@ -874,8 +860,8 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
         MD5Init(&md5);
 
         MD5Update(&md5,
-                  (byte*)atom_chunk->data,
-                  atom_chunk->size);
+                  (byte*)chunks[UTF8_ATOM_CHUNK].data,
+                  chunks[UTF8_ATOM_CHUNK].size);
         MD5Update(&md5,
                   (byte*)chunks[CODE_CHUNK].data,
                   chunks[CODE_CHUNK].size);
diff --git a/erts/emulator/beam/beam_file.h b/erts/emulator/beam/beam_file.h
index bbd5a22068..a7e0eda257 100644
--- a/erts/emulator/beam/beam_file.h
+++ b/erts/emulator/beam/beam_file.h
@@ -54,10 +54,6 @@ int iff_init(const byte *data, size_t size, IFF_File *iff);
 int iff_read_chunk(IFF_File *iff, Uint id, IFF_Chunk *chunk);
 
 typedef struct {
-    /* The encoding that was used to create this table. This is only used for
-     * version tests. */
-    ErtsAtomEncoding encoding;
-
     Sint32 count;
     Eterm *entries;
 } BeamFile_AtomTable;
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index e2de7e751f..e091b95bc5 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -171,8 +171,6 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
                        stp->beam.code.max_opcode, MAX_GENERIC_OPCODE);
     }
 
-    stp->otp_20_or_higher = (stp->beam.atoms.encoding == ERTS_ATOM_ENC_UTF8);
-
     if (!load_code(stp)) {
         goto load_error;
     }
diff --git a/erts/emulator/beam/emu/bs_instrs.tab b/erts/emulator/beam/emu/bs_instrs.tab
index c52367de2a..14ae54f8f8 100644
--- a/erts/emulator/beam/emu/bs_instrs.tab
+++ b/erts/emulator/beam/emu/bs_instrs.tab
@@ -844,70 +844,6 @@ i_bs_validate_unicode_retract(Fail, Src, Ms) {
 // Matching of binaries.
 //
 
-i_bs_start_match2 := bs_start_match.fetch.execute;
-
-bs_start_match.head() {
-    Eterm context;
-}
-
-bs_start_match.fetch(Src) {
-    context = $Src;
-}
-
-bs_start_match.execute(Fail, Live, Slots, Dst) {
-    Uint slots;
-    Uint live;
-    Eterm header;
-    if (!is_boxed(context)) {
-        $FAIL($Fail);
-    }
-    header = *boxed_val(context);
-
-    /* Reserve a slot for the start position. */
-    slots = $Slots + 1;
-    live = $Live;
-
-    if (header_is_bin_matchstate(header)) {
-        ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(context);
-        Uint actual_slots = HEADER_NUM_SLOTS(header);
-
-        /* We're not compatible with contexts created by bs_start_match3. */
-        ASSERT(actual_slots >= 1);
-
-        ms->save_offset[0] = ms->mb.offset;
-        if (ERTS_UNLIKELY(actual_slots < slots)) {
-            ErlBinMatchState* expanded;
-            Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
-            $GC_TEST_PRESERVE(wordsneeded, live, context);
-            ms = (ErlBinMatchState *) boxed_val(context);
-            expanded = (ErlBinMatchState *) HTOP;
-            *expanded = *ms;
-            *HTOP = HEADER_BIN_MATCHSTATE(slots);
-            HTOP += wordsneeded;
-            HEAP_SPACE_VERIFIED(0);
-            context = make_matchstate(expanded);
-            $REFRESH_GEN_DEST();
-        }
-        $Dst = context;
-    } else if (is_binary_header(header)) {
-        Eterm result;
-        Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
-        $GC_TEST_PRESERVE(wordsneeded, live, context);
-        HEAP_TOP(c_p) = HTOP;
-#ifdef DEBUG
-        c_p->stop = E;	/* Needed for checking in HeapOnlyAlloc(). */
-#endif
-        result = erts_bs_start_match_2(c_p, context, slots);
-        HTOP = HEAP_TOP(c_p);
-        HEAP_SPACE_VERIFIED(0);
-
-        $REFRESH_GEN_DEST();
-        $Dst = result;
-    } else {
-        $FAIL($Fail);
-    }
-}
-
 bs_test_zero_tail2(Fail, Ctx) {
     ErlBinMatchBuffer *_mb;
     _mb = (ErlBinMatchBuffer*) ms_matchbuffer($Ctx);
@@ -1157,49 +1093,6 @@ i_bs_get_utf16.execute(Fail, Flags, Dst) {
     $Dst = result;
 }
 
-bs_context_to_binary := ctx_to_bin.fetch.execute;
-
-ctx_to_bin.head() {
-    Eterm context;
-    ErlBinMatchBuffer* mb;
-    Uint size;
-    Uint offs;
-}
-
-ctx_to_bin.fetch(Src) {
-    context = $Src;
-    if (is_boxed(context) &&
-        header_is_bin_matchstate(*boxed_val(context))) {
-        ErlBinMatchState* ms;
-        ms = (ErlBinMatchState *) boxed_val(context);
-        mb = &ms->mb;
-        offs = ms->save_offset[0];
-        size = mb->size - offs;
-    } else {
-        $NEXT0();
-    }
-}
-
-ctx_to_bin.execute() {
-    Uint hole_size;
-    Uint orig = mb->orig;
-    ErlSubBin* sb = (ErlSubBin *) boxed_val(context);
-    /* Since we're going to overwrite the match state with the result, an
-     * ErlBinMatchState must be at least as large as an ErlSubBin. */
-    ERTS_CT_ASSERT(sizeof(ErlSubBin) <= sizeof(ErlBinMatchState));
-    hole_size = 1 + header_arity(sb->thing_word) - ERL_SUB_BIN_SIZE;
-    sb->thing_word = HEADER_SUB_BIN;
-    sb->size = BYTE_OFFSET(size);
-    sb->bitsize = BIT_OFFSET(size);
-    sb->offs = BYTE_OFFSET(offs);
-    sb->bitoffs = BIT_OFFSET(offs);
-    sb->is_writable = 0;
-    sb->orig = orig;
-    if (hole_size) {
-        sb[1].thing_word = make_pos_bignum_header(hole_size-1);
-    }
-}
-
 i_bs_match_string(Ctx, Fail, Bits, Ptr) {
     byte* bytes = (byte *) $Ptr;
     Uint bits = $Bits;
@@ -1221,18 +1114,6 @@ i_bs_match_string(Ctx, Fail, Bits, Ptr) {
     mb->offset += bits;
 }
 
-i_bs_save2(Src, Slot) {
-    ErlBinMatchState* _ms = (ErlBinMatchState*) boxed_val((Eterm) $Src);
-    ASSERT(HEADER_NUM_SLOTS(_ms->thing_word) > $Slot);
-    _ms->save_offset[$Slot] = _ms->mb.offset;
-}
-
-i_bs_restore2(Src, Slot) {
-    ErlBinMatchState* _ms = (ErlBinMatchState*) boxed_val((Eterm) $Src);
-    ASSERT(HEADER_NUM_SLOTS(_ms->thing_word) > $Slot);
-    _ms->mb.offset = _ms->save_offset[$Slot];
-}
-
 bs_get_tail := bs_get_tail.fetch.execute;
 
 bs_get_tail.head() {
diff --git a/erts/emulator/beam/emu/map_instrs.tab b/erts/emulator/beam/emu/map_instrs.tab
index efebd37fb3..c5168f97f2 100644
--- a/erts/emulator/beam/emu/map_instrs.tab
+++ b/erts/emulator/beam/emu/map_instrs.tab
@@ -19,14 +19,6 @@
 // %CopyrightEnd%
 //
 
-ensure_map(Map) {
-    if (is_not_map($Map)) {
-        c_p->freason = BADMAP;
-        c_p->fvalue = $Map;
-        $FAIL_BODY();
-    }
-}
-
 new_map(Dst, Live, N) {
     Eterm res;
 
diff --git a/erts/emulator/beam/emu/ops.tab b/erts/emulator/beam/emu/ops.tab
index a60f2075fe..c50b12513d 100644
--- a/erts/emulator/beam/emu/ops.tab
+++ b/erts/emulator/beam/emu/ops.tab
@@ -55,12 +55,6 @@ func_info M=a a==am_module_info A=u==1 | label L | move n x==0 => too_old_compil
 
 bif1 Fail u$func:erlang:is_constant/1 Src Dst => too_old_compiler
 
-# Since the constant pool was introduced in R12B, empty tuples ({})
-# are literals. Therefore we no longer need to allow put_tuple/2
-# with a tuple size of zero.
-
-put_tuple u==0 d => too_old_compiler
-
 #
 # All the other instructions.
 #
@@ -552,21 +546,6 @@ is_ne f? S s
 # Code compiled with OTP 22 and later uses put_tuple2 to
 # to construct a tuple.
 #
-# Code compiled before OTP 22 uses put_tuple + one put instruction
-# per element. Translate to put_tuple2.
-#
-
-i_put_tuple/2
-put_tuple Arity Dst => i_put_tuple Dst u
-
-i_put_tuple Dst Arity Puts=* | put S1 | put S2 | \
-  put S3 | put S4 | put S5 => \
-	    tuple_append_put5(Arity, Dst, Puts, S1, S2, S3, S4, S5)
-
-i_put_tuple Dst Arity Puts=* | put S => \
-	    tuple_append_put(Arity, Dst, Puts, S)
-
-i_put_tuple Dst Arity Puts=* => put_tuple2 Dst Arity Puts
 
 put_tuple2 xy I *
 
@@ -1064,29 +1043,6 @@ is_function Fail=f c => jump Fail
 
 func_info M F A => i_func_info u M F A
 
-# ================================================================
-# Bit syntax matching obsoleted in OTP 22.
-# ================================================================
-
-%cold
-bs_start_match2 Fail=f ica X Y D => jump Fail
-bs_start_match2 Fail Bin X Y D => i_bs_start_match2 Bin Fail X Y D
-i_bs_start_match2 xy f t t d
-
-bs_save2 Y=y Index => move Y x | bs_save2 x Index
-bs_save2 Reg Index => bs_save(Reg, Index)
-i_bs_save2 x t
-
-bs_restore2 Y=y Index => move Y x | bs_restore2 x Index
-bs_restore2 Reg Index => bs_restore(Reg, Index)
-i_bs_restore2 x t
-
-bs_context_to_binary Y=y | line L | badmatch Y => \
-    move Y x | bs_context_to_binary x | line L | badmatch x
-bs_context_to_binary Y=y => move Y x | bs_context_to_binary x
-bs_context_to_binary x
-%warm
-
 # ================================================================
 # New bit syntax matching (R11B).
 # ================================================================
@@ -1409,37 +1365,17 @@ apply t
 apply_last t Q
 
 #
-# Handle compatibility with OTP 17 here.
+# Map instructions. First introduced in R17.
 #
 
-i_put_map_assoc/4
-
-# We KNOW that in OTP 20 (actually OTP 18 and higher), a put_map_assoc instruction
-# is always preceded by an is_map test. That means that put_map_assoc can never
-# fail and does not need any failure label.
+# We KNOW that in OTP 18 and higher, a put_map_assoc instruction is
+# always preceded by an is_map test. That means that put_map_assoc can
+# never fail and does not need any failure label.
 
-put_map_assoc Fail Map Dst Live Size Rest=* | compiled_with_otp_20_or_higher() => \
+put_map_assoc Fail Map Dst Live Size Rest=* => \
 	      i_put_map_assoc Map Dst Live Size Rest
 
-# Translate the put_map_assoc instruction if the module was compiled by a compiler
-# before 20. This is only necessary if the OTP 17 compiler was used, but we
-# have no safe and relatively easy way to know whether OTP 18/19 was used.
-
-put_map_assoc Fail=p Map Dst Live Size Rest=* => \
-	      ensure_map Map | i_put_map_assoc Map Dst Live Size Rest
-put_map_assoc Fail=f Map Dst Live Size Rest=* => \
-	      is_map Fail Map | i_put_map_assoc Map Dst Live Size Rest
-
-ensure_map Lit=q | literal_is_map(Lit) =>
-ensure_map Src=cqy => move Src x | ensure_map x
-
-%cold
-ensure_map x
-%hot
-
-#
-# Map instructions. First introduced in R17.
-#
+i_put_map_assoc/4
 
 sorted_put_map_assoc/4
 i_put_map_assoc Map Dst Live Size Rest=* | map_key_sort(Size, Rest) => \
diff --git a/erts/emulator/beam/emu/predicates.tab b/erts/emulator/beam/emu/predicates.tab
index 1230af5859..2a14fe68f3 100644
--- a/erts/emulator/beam/emu/predicates.tab
+++ b/erts/emulator/beam/emu/predicates.tab
@@ -57,3 +57,12 @@ pred.needs_nif_padding() {
      * stub, so we'll pad to that size at the end of every function. */
     return S->may_load_nif
 }
+
+// Test whether the given literal is a map.
+pred.literal_is_map(Lit) {
+    Eterm term;
+
+    ASSERT(Lit.type == TAG_q);
+    term = beamfile_get_literal(&S->beam, Lit.val);
+    return is_map(term);
+}
diff --git a/erts/emulator/beam/generators.tab b/erts/emulator/beam/generators.tab
index c564d8497f..fd5756939a 100644
--- a/erts/emulator/beam/generators.tab
+++ b/erts/emulator/beam/generators.tab
@@ -51,31 +51,6 @@ NativeEndian(flags) {
 #endif
 }
 
-gen_bs_save_restore(reg, index, instr) {
-    BeamOp* op;
-
-    $NewBeamOp(S, op);
-    $BeamOpNameArity(op, $instr, 2);
-    op->a[0] = $reg;
-    op->a[1] = $index;
-    if (Index.type == TAG_u) {
-        op->a[1].val = $index.val+1;
-    } else if ($index.type == TAG_a && $index.val == am_start) {
-        op->a[1].type = TAG_u;
-        op->a[1].val = 0;
-    }
-    return op;
-}
-
-gen.bs_save(Reg, Index) {
-    $gen_bs_save_restore(Reg, Index, i_bs_save2);
-}
-
-gen.bs_restore(Reg, Index) {
-    $gen_bs_save_restore(Reg, Index, i_bs_restore2);
-}
-
-
 // Generate an instruction to fetch a float from a binary.
 gen.get_float2(Fail, Ms, Live, Size, Unit, Flags, Dst) {
     BeamOp* op;
@@ -411,46 +386,6 @@ gen.make_fun3(idx, Dst, NumFree, Env) {
     return op;
 }
 
-gen.tuple_append_put5(Arity, Dst, Puts, S1, S2, S3, S4, S5) {
-    BeamOp* op;
-    int arity = Arity.val;      /* Arity of tuple, not the instruction */
-    int i;
-
-    $NewBeamOp(S, op);
-    $BeamOpNameArity(op, i_put_tuple, 2);
-    $BeamOpArity(op, arity+2+5);
-    op->a[0] = Dst;
-    op->a[1].type = TAG_u;
-    op->a[1].val = arity + 5;
-    for (i = 0; i < arity; i++) {
-        op->a[i+2] = Puts[i];
-    }
-    op->a[arity+2] = S1;
-    op->a[arity+3] = S2;
-    op->a[arity+4] = S3;
-    op->a[arity+5] = S4;
-    op->a[arity+6] = S5;
-    return op;
-}
-
-gen.tuple_append_put(Arity, Dst, Puts, Src) {
-    BeamOp* op;
-    int arity = Arity.val;      /* Arity of tuple, not the instruction */
-    int i;
-
-    $NewBeamOp(S, op);
-    $BeamOpNameArity(op, i_put_tuple, 2);
-    $BeamOpArity(op, arity+2+1);
-    op->a[0] = Dst;
-    op->a[1].type = TAG_u;
-    op->a[1].val = arity + 1;
-    for (i = 0; i < arity; i++) {
-        op->a[i+2] = Puts[i];
-    }
-    op->a[arity+2] = Src;
-    return op;
-}
-
 // Generate an instruction for get/1.
 gen.get(Src, Dst) {
     BeamOp* op;
diff --git a/erts/emulator/beam/jit/arm/instr_bs.cpp b/erts/emulator/beam/jit/arm/instr_bs.cpp
index c8cdc34989..93a65f613a 100644
--- a/erts/emulator/beam/jit/arm/instr_bs.cpp
+++ b/erts/emulator/beam/jit/arm/instr_bs.cpp
@@ -1355,63 +1355,3 @@ void BeamModuleAssembler::emit_bs_init_writable() {
 
     a.mov(XREG0, ARG1);
 }
-
-/* Old compatibility instructions for <= OTP-21. Kept in order to be able to
- * load old code. While technically we could remove these in OTP-24, we've
- * decided to keep them until at least OTP-25 to make things easier for
- * users. */
-void BeamModuleAssembler::emit_i_bs_start_match2(const ArgVal &Src,
-                                                 const ArgVal &Fail,
-                                                 const ArgVal &Live,
-                                                 const ArgVal &Slots,
-                                                 const ArgVal &Dst) {
-    mov_arg(ARG1, Src);
-    mov_arg(ARG2, Live);
-    mov_arg(ARG3, Slots);
-
-    emit_enter_runtime<Update::eStack | Update::eHeap | Update::eXRegs |
-                       Update::eReductions>(Live.getValue());
-
-    a.mov(ARG4, c_p);
-    load_x_reg_array(ARG5);
-    runtime_call<5>(beam_jit_bs_start_match2);
-
-    emit_leave_runtime<Update::eStack | Update::eHeap | Update::eXRegs |
-                       Update::eReductions>(Live.getValue());
-
-    emit_branch_if_not_value(ARG1, resolve_beam_label(Fail, dispUnknown));
-    mov_arg(Dst, ARG1);
-}
-
-void BeamModuleAssembler::emit_i_bs_save2(const ArgVal &Ctx,
-                                          const ArgVal &Slot) {
-    const int slot_offset = offsetof(ErlBinMatchState, save_offset) +
-                            (sizeof(Eterm) * Slot.getValue());
-    const int mb_offset = offsetof(ErlBinMatchState, mb.offset);
-    auto ctx_reg = load_source(Ctx, TMP1);
-
-    a.ldur(TMP2, emit_boxed_val(ctx_reg.reg, mb_offset));
-    a.stur(TMP2, emit_boxed_val(ctx_reg.reg, slot_offset));
-}
-
-void BeamModuleAssembler::emit_i_bs_restore2(const ArgVal &Ctx,
-                                             const ArgVal &Slot) {
-    const int slot_offset = offsetof(ErlBinMatchState, save_offset) +
-                            (sizeof(Eterm) * Slot.getValue());
-    const int mb_offset = offsetof(ErlBinMatchState, mb.offset);
-
-    auto ctx_reg = load_source(Ctx, TMP1);
-
-    a.ldur(TMP2, emit_boxed_val(ctx_reg.reg, slot_offset));
-    a.stur(TMP2, emit_boxed_val(ctx_reg.reg, mb_offset));
-}
-
-void BeamModuleAssembler::emit_bs_context_to_binary(const ArgVal &Src) {
-    mov_arg(ARG1, Src);
-
-    emit_enter_runtime();
-
-    runtime_call<1>(beam_jit_bs_context_to_binary);
-
-    emit_leave_runtime();
-}
diff --git a/erts/emulator/beam/jit/arm/instr_map.cpp b/erts/emulator/beam/jit/arm/instr_map.cpp
index 1018fef413..ba6bb40f77 100644
--- a/erts/emulator/beam/jit/arm/instr_map.cpp
+++ b/erts/emulator/beam/jit/arm/instr_map.cpp
@@ -28,28 +28,6 @@ extern "C"
 #include "beam_common.h"
 }
 
-void BeamModuleAssembler::emit_ensure_map(const ArgVal &map) {
-    Label next = a.newLabel(), badmap = a.newLabel();
-
-    auto map_reg = load_source(map, TMP1);
-
-    emit_is_boxed(badmap, map_reg.reg);
-
-    arm::Gp boxed_ptr = emit_ptr_val(TMP2, map_reg.reg);
-    a.ldur(TMP2, emit_boxed_val(boxed_ptr));
-    a.and_(TMP2, TMP2, imm(_TAG_HEADER_MASK));
-    a.cmp(TMP2, imm(_TAG_HEADER_MAP));
-    a.cond_eq().b(next);
-
-    a.bind(badmap);
-    {
-        a.stur(map_reg.reg, arm::Mem(c_p, offsetof(Process, fvalue)));
-        emit_error(BADMAP);
-    }
-
-    a.bind(next);
-}
-
 void BeamGlobalAssembler::emit_new_map_shared() {
     emit_enter_runtime_frame();
     emit_enter_runtime<Update::eStack | Update::eHeap | Update::eXRegs |
diff --git a/erts/emulator/beam/jit/arm/ops.tab b/erts/emulator/beam/jit/arm/ops.tab
index 3fecfaafab..d6f0c283f6 100644
--- a/erts/emulator/beam/jit/arm/ops.tab
+++ b/erts/emulator/beam/jit/arm/ops.tab
@@ -55,12 +55,6 @@ func_info M=a a==am_module_info A=u==1 | label L | move n x==0 => too_old_compil
 
 bif1 Fail u$func:erlang:is_constant/1 Src Dst => too_old_compiler
 
-# Since the constant pool was introduced in R12B, empty tuples ({})
-# are literals. Therefore we no longer need to allow put_tuple/2
-# with a tuple size of zero.
-
-put_tuple u==0 d => too_old_compiler
-
 #
 # All the other instructions.
 #
@@ -423,21 +417,6 @@ is_ne f? s s
 # Code compiled with OTP 22 and later uses put_tuple2 to
 # to construct a tuple.
 #
-# Code compiled before OTP 22 uses put_tuple + one put instruction
-# per element. Translate to put_tuple2.
-#
-
-i_put_tuple/2
-put_tuple Arity Dst => i_put_tuple Dst u
-
-i_put_tuple Dst Arity Puts=* | put S1 | put S2 | \
-  put S3 | put S4 | put S5 => \
-	    tuple_append_put5(Arity, Dst, Puts, S1, S2, S3, S4, S5)
-
-i_put_tuple Dst Arity Puts=* | put S => \
-	    tuple_append_put(Arity, Dst, Puts, S)
-
-i_put_tuple Dst Arity Puts=* => put_tuple2 Dst Arity Puts
 
 put_tuple2 S A *
 
@@ -800,24 +779,6 @@ i_flush_stubs
 # Handles tracing, early NIF calls, and so on.
 i_breakpoint_trampoline
 
-# ================================================================
-# Bit syntax matching obsoleted in OTP 22.
-# ================================================================
-
-%cold
-bs_start_match2 Fail=f ica X Y D => jump Fail
-bs_start_match2 Fail Bin X Y D => i_bs_start_match2 Bin Fail X Y D
-i_bs_start_match2 S f t t d
-
-bs_save2 Reg Index => bs_save(Reg, Index)
-i_bs_save2 x t
-
-bs_restore2 Reg Index => bs_restore(Reg, Index)
-i_bs_restore2 S t
-
-bs_context_to_binary S
-%warm
-
 # ================================================================
 # New bit syntax matching (R11B).
 # ================================================================
@@ -1095,36 +1056,16 @@ apply t
 apply_last t t
 
 #
-# Handle compatibility with OTP 17 here.
+# Map instructions. First introduced in R17.
 #
 
-i_put_map_assoc/4
-
-# We KNOW that in OTP 20 (actually OTP 18 and higher), a put_map_assoc instruction
-# is always preceded by an is_map test. That means that put_map_assoc can never
-# fail and does not need any failure label.
+# We KNOW that in OTP 18 and higher, a put_map_assoc instruction is
+# always preceded by an is_map test. That means that put_map_assoc can
+# never fail and does not need any failure label.
 
-put_map_assoc Fail Map Dst Live Size Rest=* | compiled_with_otp_20_or_higher() => \
+put_map_assoc Fail Map Dst Live Size Rest=* => \
 	      i_put_map_assoc Map Dst Live Size Rest
-
-# Translate the put_map_assoc instruction if the module was compiled by a compiler
-# before 20. This is only necessary if the OTP 17 compiler was used, but we
-# have no safe and relatively easy way to know whether OTP 18/19 was used.
-
-put_map_assoc Fail=p Map Dst Live Size Rest=* => \
-	      ensure_map Map | i_put_map_assoc Map Dst Live Size Rest
-put_map_assoc Fail=f Map Dst Live Size Rest=* => \
-	      is_map Fail Map | i_put_map_assoc Map Dst Live Size Rest
-
-ensure_map Lit=q | literal_is_map(Lit) =>
-
-%cold
-ensure_map s
-%hot
-
-#
-# Map instructions. First introduced in R17.
-#
+i_put_map_assoc/4
 
 sorted_put_map_assoc/4
 i_put_map_assoc Map Dst Live Size Rest=* | map_key_sort(Size, Rest) => \
diff --git a/erts/emulator/beam/jit/load.h b/erts/emulator/beam/jit/load.h
index 7bb36f0947..12299d5727 100644
--- a/erts/emulator/beam/jit/load.h
+++ b/erts/emulator/beam/jit/load.h
@@ -92,8 +92,6 @@ struct LoaderState_ {
     int function_number;
     int last_label;
 
-    int otp_20_or_higher;
-
     BeamOpAllocator op_allocator;
     BeamFile beam;
 };
diff --git a/erts/emulator/beam/jit/x86/instr_bs.cpp b/erts/emulator/beam/jit/x86/instr_bs.cpp
index ee68e52420..1aad5060ef 100644
--- a/erts/emulator/beam/jit/x86/instr_bs.cpp
+++ b/erts/emulator/beam/jit/x86/instr_bs.cpp
@@ -1559,61 +1559,3 @@ void BeamModuleAssembler::emit_bs_init_writable() {
 
     emit_leave_runtime<Update::eReductions | Update::eStack | Update::eHeap>();
 }
-
-/* Old compatibility instructions for <= OTP-21. Kept in order to be able to
- * load old code. While technically we could remove these in OTP-24, we've
- * decided to keep them until at least OTP-25 to make things easier for
- * users. */
-void BeamModuleAssembler::emit_i_bs_start_match2(const ArgVal &Src,
-                                                 const ArgVal &Fail,
-                                                 const ArgVal &Live,
-                                                 const ArgVal &Slots,
-                                                 const ArgVal &Dst) {
-    mov_arg(ARG1, Src);
-    mov_arg(ARG2, Live);
-    mov_arg(ARG3, Slots);
-
-    emit_enter_runtime<Update::eReductions | Update::eStack | Update::eHeap>();
-
-    a.mov(ARG4, c_p);
-    load_x_reg_array(ARG5);
-    runtime_call<5>(beam_jit_bs_start_match2);
-
-    emit_leave_runtime<Update::eReductions | Update::eStack | Update::eHeap>();
-
-    emit_test_the_non_value(RET);
-    a.je(labels[Fail.getValue()]);
-    mov_arg(Dst, RET);
-}
-
-void BeamModuleAssembler::emit_i_bs_save2(const ArgVal &Ctx,
-                                          const ArgVal &Slot) {
-    int slot_offset = offsetof(ErlBinMatchState, save_offset) +
-                      (sizeof(Eterm) * Slot.getValue());
-
-    mov_arg(ARG1, Ctx);
-
-    a.mov(ARG2, emit_boxed_val(ARG1, offsetof(ErlBinMatchState, mb.offset)));
-    a.mov(emit_boxed_val(ARG1, slot_offset), ARG2);
-}
-
-void BeamModuleAssembler::emit_i_bs_restore2(const ArgVal &Ctx,
-                                             const ArgVal &Slot) {
-    int slot_offset = offsetof(ErlBinMatchState, save_offset) +
-                      (sizeof(Eterm) * Slot.getValue());
-
-    mov_arg(ARG1, Ctx);
-
-    a.mov(ARG2, emit_boxed_val(ARG1, slot_offset));
-    a.mov(emit_boxed_val(ARG1, offsetof(ErlBinMatchState, mb.offset)), ARG2);
-}
-
-void BeamModuleAssembler::emit_bs_context_to_binary(const ArgVal &Src) {
-    mov_arg(ARG1, Src);
-
-    emit_enter_runtime();
-
-    runtime_call<1>(beam_jit_bs_context_to_binary);
-
-    emit_leave_runtime();
-}
diff --git a/erts/emulator/beam/jit/x86/instr_map.cpp b/erts/emulator/beam/jit/x86/instr_map.cpp
index f0d42603bd..e413fbd72b 100644
--- a/erts/emulator/beam/jit/x86/instr_map.cpp
+++ b/erts/emulator/beam/jit/x86/instr_map.cpp
@@ -28,27 +28,6 @@ extern "C"
 #include "beam_common.h"
 }
 
-void BeamModuleAssembler::emit_ensure_map(const ArgVal &map) {
-    Label next = a.newLabel(), badmap = a.newLabel();
-
-    mov_arg(ARG1, map);
-    emit_is_boxed(badmap, ARG1, dShort);
-    /* We use ARG1 in the badmap branch, so use ARG2 below */
-    x86::Gp boxed_ptr = emit_ptr_val(ARG2, ARG1);
-    a.mov(ARG2, emit_boxed_val(boxed_ptr));
-    a.and_(ARG2d, imm(_TAG_HEADER_MASK));
-    a.cmp(ARG2d, imm(_TAG_HEADER_MAP));
-    a.short_().je(next);
-
-    a.bind(badmap);
-    {
-        a.mov(x86::qword_ptr(c_p, offsetof(Process, fvalue)), ARG1);
-        emit_error(BADMAP);
-    }
-
-    a.bind(next);
-}
-
 void BeamGlobalAssembler::emit_new_map_shared() {
     emit_enter_frame();
     emit_enter_runtime<Update::eReductions | Update::eStack | Update::eHeap>();
diff --git a/erts/emulator/beam/jit/x86/ops.tab b/erts/emulator/beam/jit/x86/ops.tab
index b2477df813..8109821a1b 100644
--- a/erts/emulator/beam/jit/x86/ops.tab
+++ b/erts/emulator/beam/jit/x86/ops.tab
@@ -55,12 +55,6 @@ func_info M=a a==am_module_info A=u==1 | label L | move n x==0 => too_old_compil
 
 bif1 Fail u$func:erlang:is_constant/1 Src Dst => too_old_compiler
 
-# Since the constant pool was introduced in R12B, empty tuples ({})
-# are literals. Therefore we no longer need to allow put_tuple/2
-# with a tuple size of zero.
-
-put_tuple u==0 d => too_old_compiler
-
 #
 # All the other instructions.
 #
@@ -428,21 +422,6 @@ is_ne f? s s
 # Code compiled with OTP 22 and later uses put_tuple2 to
 # to construct a tuple.
 #
-# Code compiled before OTP 22 uses put_tuple + one put instruction
-# per element. Translate to put_tuple2.
-#
-
-i_put_tuple/2
-put_tuple Arity Dst => i_put_tuple Dst u
-
-i_put_tuple Dst Arity Puts=* | put S1 | put S2 | \
-  put S3 | put S4 | put S5 => \
-	    tuple_append_put5(Arity, Dst, Puts, S1, S2, S3, S4, S5)
-
-i_put_tuple Dst Arity Puts=* | put S => \
-	    tuple_append_put(Arity, Dst, Puts, S)
-
-i_put_tuple Dst Arity Puts=* => put_tuple2 Dst Arity Puts
 
 put_tuple2 S A *
 
@@ -781,24 +760,6 @@ i_lambda_trampoline W f W W
 # Handles tracing, early NIF calls, and so on.
 i_breakpoint_trampoline
 
-# ================================================================
-# Bit syntax matching obsoleted in OTP 22.
-# ================================================================
-
-%cold
-bs_start_match2 Fail=f ica X Y D => jump Fail
-bs_start_match2 Fail Bin X Y D => i_bs_start_match2 Bin Fail X Y D
-i_bs_start_match2 S f t t d
-
-bs_save2 Reg Index => bs_save(Reg, Index)
-i_bs_save2 x t
-
-bs_restore2 Reg Index => bs_restore(Reg, Index)
-i_bs_restore2 S t
-
-bs_context_to_binary S
-%warm
-
 # ================================================================
 # New bit syntax matching (R11B).
 # ================================================================
@@ -1080,36 +1041,17 @@ apply t
 apply_last t t
 
 #
-# Handle compatibility with OTP 17 here.
+# Map instructions. First introduced in R17.
 #
 
-i_put_map_assoc/4
-
-# We KNOW that in OTP 20 (actually OTP 18 and higher), a put_map_assoc instruction
-# is always preceded by an is_map test. That means that put_map_assoc can never
-# fail and does not need any failure label.
+# We KNOW that in OTP 18 and higher, a put_map_assoc instruction is
+# always preceded by an is_map test. That means that put_map_assoc can
+# never fail and does not need any failure label.
 
-put_map_assoc Fail Map Dst Live Size Rest=* | compiled_with_otp_20_or_higher() => \
+put_map_assoc Fail Map Dst Live Size Rest=* => \
 	      i_put_map_assoc Map Dst Live Size Rest
 
-# Translate the put_map_assoc instruction if the module was compiled by a compiler
-# before 20. This is only necessary if the OTP 17 compiler was used, but we
-# have no safe and relatively easy way to know whether OTP 18/19 was used.
-
-put_map_assoc Fail=p Map Dst Live Size Rest=* => \
-	      ensure_map Map | i_put_map_assoc Map Dst Live Size Rest
-put_map_assoc Fail=f Map Dst Live Size Rest=* => \
-	      is_map Fail Map | i_put_map_assoc Map Dst Live Size Rest
-
-ensure_map Lit=q | literal_is_map(Lit) =>
-
-%cold
-ensure_map s
-%hot
-
-#
-# Map instructions. First introduced in R17.
-#
+i_put_map_assoc/4
 
 sorted_put_map_assoc/4
 i_put_map_assoc Map Dst Live Size Rest=* | map_key_sort(Size, Rest) => \
diff --git a/erts/emulator/beam/predicates.tab b/erts/emulator/beam/predicates.tab
index 7e82ddd18e..239b763174 100644
--- a/erts/emulator/beam/predicates.tab
+++ b/erts/emulator/beam/predicates.tab
@@ -23,10 +23,6 @@ pred.never() {
     return 0;
 }
 
-pred.compiled_with_otp_20_or_higher() {
-    return S->otp_20_or_higher;
-}
-
 // Test whether a jump table can be used.
 pred.use_jump_tab(Size, Rest, MinSize) {
     Sint min, max;
@@ -144,15 +140,6 @@ pred.is_heavy_bif(Bif) {
     return 0;
 }
 
-// Test whether the given literal is a map.
-pred.literal_is_map(Lit) {
-    Eterm term;
-
-    ASSERT(Lit.type == TAG_q);
-    term = beamfile_get_literal(&S->beam, Lit.val);
-    return is_map(term);
-}
-
 // Predicate to test whether all of the given new small map keys are literals
 pred.is_small_map_literal_keys(Size, Rest) {
     Uint pair_count = Size.val / 2;
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index d9de7031a0..7d1cf90c8e 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -142,9 +142,8 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, ExtraChunks, CompileInfo, Comp
 		      Code),
 
     %% Create the atom table chunk.
-    AtomEncoding = atom_encoding(CompilerOpts),
-    {NumAtoms, AtomTab} = beam_dict:atom_table(Dict, AtomEncoding),
-    AtomChunk = chunk(atom_chunk_name(AtomEncoding), <<NumAtoms:32>>, AtomTab),
+    {NumAtoms, AtomTab} = beam_dict:atom_table(Dict),
+    AtomChunk = chunk(<<"AtU8">>, <<NumAtoms:32>>, AtomTab),
 
     %% Create the import table chunk.
 
@@ -220,15 +219,6 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, ExtraChunks, CompileInfo, Comp
 	     end,
     build_form(<<"BEAM">>, Chunks).
 
-atom_encoding(Opts) ->
-    case proplists:get_bool(no_utf8_atoms, Opts) of
-	false -> utf8;
-	true -> latin1
-    end.
-
-atom_chunk_name(utf8) -> <<"AtU8">>;
-atom_chunk_name(latin1) -> <<"Atom">>.
-
 %% finalize_fun_table(Essentials, MD5) -> FinalizedEssentials
 %%  Update the 'old_uniq' field in the entry for each fun in the
 %%  'FunT' chunk. We'll use part of the MD5 for the module as a
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index 3b191db676..bcbb03bf31 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -154,8 +154,6 @@ collect({bif,N,{f,0},As,D})  -> {set,[D],As,{bif,N,{f,0}}};
 collect({gc_bif,N,{f,0},R,As,D}) ->   {set,[D],As,{alloc,R,{gc_bif,N,{f,0}}}};
 collect({move,S,D})          -> {set,[D],[S],move};
 collect({put_list,S1,S2,D})  -> {set,[D],[S1,S2],put_list};
-collect({put_tuple,A,D})     -> {set,[D],[],{put_tuple,A}};
-collect({put,S})             -> {set,[],[S],put};
 collect({put_tuple2,D,{list,Els}}) -> {set,[D],Els,put_tuple2};
 collect({get_tuple_element,S,I,D}) -> {set,[D],[S],{get_tuple_element,I}};
 collect({set_tuple_element,S,D,I}) -> {set,[],[S,D],{set_tuple_element,I}};
diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index 208828c1e7..43a8ea4fb1 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -24,7 +24,7 @@
 -export([new/0,opcode/2,highest_opcode/1,
 	 atom/2,local/4,export/4,import/4,
 	 string/2,lambda/3,literal/2,line/2,fname/2,
-	 atom_table/2,local_table/1,export_table/1,import_table/1,
+	 atom_table/1,local_table/1,export_table/1,import_table/1,
 	 string_table/1,lambda_table/1,literal_table/1,
 	 line_table/1]).
 
@@ -227,13 +227,13 @@ fname(Name, #asm{fnames=Fnames}=Dict) ->
 
 %% Returns the atom table.
 %%    atom_table(Dict, Encoding) -> {LastIndex,[Length,AtomString...]}
--spec atom_table(bdict(), latin1 | utf8) -> {non_neg_integer(), [[non_neg_integer(),...]]}.
+-spec atom_table(bdict()) -> {non_neg_integer(), [[non_neg_integer(),...]]}.
 
-atom_table(#asm{atoms=Atoms}, Encoding) ->
+atom_table(#asm{atoms=Atoms}) ->
     NumAtoms = maps:size(Atoms),
     Sorted = lists:keysort(2, maps:to_list(Atoms)),
     {NumAtoms,[begin
-                   L = atom_to_binary(A, Encoding),
+                   L = atom_to_binary(A, utf8),
                    [byte_size(L),L]
                end || {A,_} <- Sorted]}.
 
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index ae2ca16218..172cf68d35 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -55,8 +55,6 @@ norm({set,[D],[S],fmove})         -> {fmove,S,D};
 norm({set,[D],[S],fconv})         -> {fconv,S,D};
 norm({set,[D],[S1,S2],put_list})  -> {put_list,S1,S2,D};
 norm({set,[D],Els,put_tuple2})    -> {put_tuple2,D,{list,Els}};
-norm({set,[D],[],{put_tuple,A}})  -> {put_tuple,A,D};
-norm({set,[],[S],put})            -> {put,S};
 norm({set,[D],[S],{get_tuple_element,I}}) -> {get_tuple_element,S,I,D};
 norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
 norm({set,[D],[S],get_hd})        -> {get_hd,S,D};
diff --git a/lib/compiler/src/beam_ssa_codegen.erl b/lib/compiler/src/beam_ssa_codegen.erl
index c74b696711..c929b65aa3 100644
--- a/lib/compiler/src/beam_ssa_codegen.erl
+++ b/lib/compiler/src/beam_ssa_codegen.erl
@@ -342,8 +342,6 @@ add_heap_float(#need{f=F}=N) ->
 
 classify_heap_need(put_list, _) ->
     {put,2};
-classify_heap_need(put_tuple_arity, [#b_literal{val=Words}]) ->
-    {put,Words+1};
 classify_heap_need(put_tuple, Elements) ->
     {put,length(Elements)+1};
 classify_heap_need(make_fun, Args) ->
@@ -380,8 +378,6 @@ classify_heap_need(bs_init) -> gc;
 classify_heap_need(bs_init_writable) -> gc;
 classify_heap_need(bs_match_string) -> gc;
 classify_heap_need(bs_put) -> neutral;
-classify_heap_need(bs_restore) -> neutral;
-classify_heap_need(bs_save) -> neutral;
 classify_heap_need(bs_get_position) -> gc;
 classify_heap_need(bs_set_position) -> neutral;
 classify_heap_need(bs_skip) -> gc;
@@ -409,7 +405,6 @@ classify_heap_need(new_try_tag) -> gc;
 classify_heap_need(old_make_fun) -> gc;
 classify_heap_need(peek_message) -> gc;
 classify_heap_need(put_map) -> gc;
-classify_heap_need(put_tuple_elements) -> neutral;
 classify_heap_need(raw_raise) -> gc;
 classify_heap_need(recv_marker_bind) -> neutral;
 classify_heap_need(recv_marker_clear) -> neutral;
@@ -1137,23 +1132,15 @@ cg_block([#cg_set{op=bs_init,dst=Dst0,args=Args0,anno=Anno}=I,
             Is = [Line,{bs_append,Fail,Bits,Alloc,Live,Unit,Src,Flags,Dst}],
             {Is,St}
     end;
-cg_block([#cg_set{anno=Anno,
-                  op=bs_start_match,
+cg_block([#cg_set{op=bs_start_match,
                   dst=Ctx0,
                   args=[#b_literal{val=new},Bin0]}=I,
           #cg_set{op=succeeded,dst=Bool}], {Bool,Fail}, St) ->
     [Dst,Bin1] = beam_args([Ctx0,Bin0], St),
     {Bin,Pre} = force_reg(Bin1, Dst),
     Live = get_live(I),
-    %% num_slots is only set when using the old instructions.
-    case maps:find(num_slots, Anno) of
-        {ok, Slots} ->
-            Is = Pre ++ [{test,bs_start_match2,Fail,Live,[Bin,Slots],Dst}],
-            {Is,St};
-        error ->
-            Is = Pre ++ [{test,bs_start_match3,Fail,Live,[Bin],Dst}],
-            {Is,St}
-    end;
+    Is = Pre ++ [{test,bs_start_match3,Fail,Live,[Bin],Dst}],
+    {Is,St};
 cg_block([#cg_set{op=bs_get}=Set,
           #cg_set{op=succeeded,dst=Bool}], {Bool,Fail}, St) ->
     {cg_bs_get(Fail, Set, St),St};
@@ -1692,16 +1679,6 @@ cg_instr(Op, Args, Dst, _Set) ->
 
 cg_instr(bs_init_writable, Args, Dst) ->
     setup_args(Args) ++ [bs_init_writable|copy({x,0}, Dst)];
-cg_instr(bs_restore, [Ctx,Slot], _Dst) ->
-    case Slot of
-        {integer,N} ->
-            [{bs_restore2,Ctx,N}];
-        {atom,start} ->
-            [{bs_restore2,Ctx,Slot}]
-    end;
-cg_instr(bs_save, [Ctx,Slot], _Dst) ->
-    {integer,N} = Slot,
-    [{bs_save2,Ctx,N}];
 cg_instr(bs_set_position, [Ctx,Pos], _Dst) ->
     [{bs_set_position,Ctx,Pos}];
 cg_instr(build_stacktrace, Args, Dst) ->
@@ -1726,10 +1703,6 @@ cg_instr(nop, [], _Dst) ->
     [];
 cg_instr(put_tuple, Elements, Dst) ->
     [{put_tuple2,Dst,{list,Elements}}];
-cg_instr(put_tuple_arity, [{integer,Arity}], Dst) ->
-    [{put_tuple,Arity,Dst}];
-cg_instr(put_tuple_elements, Elements, _Dst) ->
-    [{put,E} || E <- Elements];
 cg_instr(raw_raise, Args, Dst) ->
     setup_args(Args) ++ [raw_raise|copy({x,0}, Dst)];
 cg_instr(recv_marker_bind, [Mark, Ref], _Dst) ->
diff --git a/lib/compiler/src/beam_ssa_pre_codegen.erl b/lib/compiler/src/beam_ssa_pre_codegen.erl
index 6ff4e3001f..23890447c5 100644
--- a/lib/compiler/src/beam_ssa_pre_codegen.erl
+++ b/lib/compiler/src/beam_ssa_pre_codegen.erl
@@ -78,14 +78,13 @@
                     {'ok',beam_ssa:b_module()}.
 
 module(#b_module{body=Fs0}=Module, Opts) ->
-    UseBSM3 = not proplists:get_bool(no_bsm3, Opts),
     Ps = passes(Opts),
-    Fs = functions(Fs0, Ps, UseBSM3),
+    Fs = functions(Fs0, Ps),
     {ok,Module#b_module{body=Fs}}.
 
-functions([F|Fs], Ps, UseBSM3) ->
-    [function(F, Ps, UseBSM3)|functions(Fs, Ps, UseBSM3)];
-functions([], _Ps, _UseBSM3) -> [].
+functions([F|Fs], Ps) ->
+    [function(F, Ps)|functions(Fs, Ps)];
+functions([], _Ps) -> [].
 
 -type b_var() :: beam_ssa:b_var().
 -type var_name() :: beam_ssa:var_name().
@@ -103,7 +102,6 @@ functions([], _Ps, _UseBSM3) -> [].
 -record(st, {ssa :: beam_ssa:block_map(),
              args :: [b_var()],
              cnt :: beam_ssa:label(),
-             use_bsm3 :: boolean(),
              frames=[] :: [beam_ssa:label()],
              intervals=[] :: [{b_var(),[range()]}],
              res=[] :: [{b_var(),reservation()}] | #{b_var():=reservation()},
@@ -115,17 +113,12 @@ functions([], _Ps, _UseBSM3) -> [].
 
 passes(Opts) ->
     AddPrecgAnnos = proplists:get_bool(dprecg, Opts),
-    FixTuples = proplists:get_bool(no_put_tuple2, Opts),
     Ps = [?PASS(assert_no_critical_edges),
 
           %% Preliminaries.
           ?PASS(fix_bs),
           ?PASS(sanitize),
           ?PASS(match_fail_instructions),
-          case FixTuples of
-              false -> ignore;
-              true -> ?PASS(fix_tuples)
-          end,
           ?PASS(use_set_tuple_element),
           ?PASS(place_frames),
           ?PASS(fix_receives),
@@ -134,10 +127,6 @@ passes(Opts) ->
           ?PASS(find_yregs),
           ?PASS(reserve_yregs),
 
-          %% Handle legacy binary match instruction that don't
-          %% accept a Y register as destination.
-          ?PASS(legacy_bs),
-
           %% Improve reuse of Y registers to potentially
           %% reduce the size of the stack frame.
           ?PASS(copy_retval),
@@ -163,11 +152,10 @@ passes(Opts) ->
           ?PASS(assert_no_critical_edges)],
     [P || P <- Ps, P =/= ignore].
 
-function(#b_function{anno=Anno,args=Args,bs=Blocks0,cnt=Count0}=F0,
-         Ps, UseBSM3) ->
+function(#b_function{anno=Anno,args=Args,bs=Blocks0,cnt=Count0}=F0, Ps) ->
     try
         Location = maps:get(location, Anno, none),
-        St0 = #st{ssa=Blocks0,args=Args,use_bsm3=UseBSM3,
+        St0 = #st{ssa=Blocks0,args=Args,
                   cnt=Count0,location=Location},
         St = compile:run_sub_passes(Ps, St0),
         #st{ssa=Blocks,cnt=Count,regs=Regs,extra_annos=ExtraAnnos} = St,
@@ -210,14 +198,9 @@ assert_no_ces(_, #b_blk{is=[#b_set{op=phi,args=[_,_]=Phis}|_]}, Blocks) ->
 assert_no_ces(_, _, Blocks) -> Blocks.
 
 %% fix_bs(St0) -> St.
-%%  Fix up the binary matching instructions:
-%%
-%%    * Insert bs_save and bs_restore instructions where needed.
-%%
-%%    * Combine bs_match and bs_extract instructions to bs_get
-%%      instructions.
+%%  Combine bs_match and bs_extract instructions to bs_get instructions.
 
-fix_bs(#st{ssa=Blocks,cnt=Count0,use_bsm3=UseBSM3}=St) ->
+fix_bs(#st{ssa=Blocks,cnt=Count0}=St) ->
     F = fun(#b_set{op=bs_start_match,dst=Dst}, A) ->
                 %% Mark the root of the match context list.
                 [{Dst,{context,Dst}}|A];
@@ -237,12 +220,7 @@ fix_bs(#st{ssa=Blocks,cnt=Count0,use_bsm3=UseBSM3}=St) ->
             Linear0 = beam_ssa:linearize(Blocks),
 
             %% Insert position instructions where needed.
-            {Linear1,Count} = case UseBSM3 of
-                                  true ->
-                                      bs_pos_bsm3(Linear0, CtxChain, Count0);
-                                  false ->
-                                      bs_pos_bsm2(Linear0, CtxChain, Count0)
-                              end,
+            {Linear1,Count} = bs_pos_bsm3(Linear0, CtxChain, Count0),
 
             %% Rename instructions.
             Linear = bs_instrs(Linear1, CtxChain, []),
@@ -296,60 +274,6 @@ make_bs_pos_dict_1([H|T], Ctx, I, Acc) ->
 make_bs_pos_dict_1([], Ctx, I, Acc) ->
     {[{Ctx,I}|Acc], I}.
 
-%% As bs_position but without OTP-22 instructions. This is only used when
-%% cross-compiling to older versions.
-bs_pos_bsm2(Linear0, CtxChain, Count0) ->
-    Rs0 = bs_restores(Linear0, CtxChain, #{}, #{}),
-    Rs = maps:values(Rs0),
-    S0 = sofs:relation(Rs, [{context,save_point}]),
-    S1 = sofs:relation_to_family(S0),
-    S = sofs:to_external(S1),
-    Slots = make_save_point_dict(S, []),
-    {Saves,Count1} = make_save_map(Rs, Slots, Count0, []),
-    {Restores,Count} = make_restore_map(maps:to_list(Rs0), Slots, Count1, []),
-
-    %% Now insert all saves and restores.
-    {bs_insert_bsm2(Linear0, Saves, Restores, Slots),Count}.
-
-make_save_map([{Ctx,Save}=Ps|T], Slots, Count, Acc) ->
-    Ignored = #b_var{name={'@ssa_ignored',Count}},
-    case make_slot(Ps, Slots) of
-        #b_literal{val=start} ->
-            make_save_map(T, Slots, Count, Acc);
-        Slot ->
-            I = #b_set{op=bs_save,dst=Ignored,args=[Ctx,Slot]},
-            make_save_map(T, Slots, Count+1, [{Save,I}|Acc])
-    end;
-make_save_map([], _, Count, Acc) ->
-    {maps:from_list(Acc),Count}.
-
-make_restore_map([{Bef,{Ctx,_}=Ps}|T], Slots, Count, Acc) ->
-    Ignored = #b_var{name={'@ssa_ignored',Count}},
-    I = #b_set{op=bs_restore,dst=Ignored,args=[Ctx,make_slot(Ps, Slots)]},
-    make_restore_map(T, Slots, Count+1, [{Bef,I}|Acc]);
-make_restore_map([], _, Count, Acc) ->
-    {maps:from_list(Acc),Count}.
-
-make_slot({Same,Same}, _Slots) ->
-    #b_literal{val=start};
-make_slot({_,_}=Ps, Slots) ->
-    #b_literal{val=map_get(Ps, Slots)}.
-
-make_save_point_dict([{Ctx,Pts}|T], Acc0) ->
-    Acc = make_save_point_dict_1(Pts, Ctx, 0, Acc0),
-    make_save_point_dict(T, Acc);
-make_save_point_dict([], Acc) ->
-    maps:from_list(Acc).
-
-make_save_point_dict_1([Ctx|T], Ctx, I, Acc) ->
-    %% Special {atom,start} save point. Does not need a
-    %% bs_save instruction.
-    make_save_point_dict_1(T, Ctx, I, Acc);
-make_save_point_dict_1([H|T], Ctx, I, Acc) ->
-    make_save_point_dict_1(T, Ctx, I+1, [{{Ctx,H},I}|Acc]);
-make_save_point_dict_1([], Ctx, I, Acc) ->
-    [{Ctx,I}|Acc].
-
 bs_restores([{L,#b_blk{is=Is,last=Last}}|Bs], CtxChain, D0, Rs0) ->
     InPos = maps:get(L, D0, #{}),
     {SuccPos, FailPos, Rs} = bs_restores_is(Is, CtxChain, InPos, InPos, Rs0),
@@ -561,20 +485,6 @@ bs_restore_args([], Pos, _CtxChain, _Dst, Rs) ->
 bs_insert_bsm3(Blocks, Saves, Restores) ->
     bs_insert_1(Blocks, [], Saves, Restores, fun(I) -> I end).
 
-bs_insert_bsm2(Blocks, Saves, Restores, Slots) ->
-    %% The old instructions require bs_start_match to be annotated with the
-    %% number of position slots it needs.
-    bs_insert_1(Blocks, [], Saves, Restores,
-                fun(#b_set{op=bs_start_match,dst=Dst}=I0) ->
-                        NumSlots = case Slots of
-                                       #{Dst:=NumSlots0} -> NumSlots0;
-                                       #{} -> 0
-                                   end,
-                        beam_ssa:add_anno(num_slots, NumSlots, I0);
-                   (I) ->
-                        I
-                end).
-
 bs_insert_1([{L,#b_blk{is=Is0}=Blk} | Bs], Deferred0, Saves, Restores, XFrm) ->
     Is1 = bs_insert_deferred(Is0, Deferred0),
     {Is, Deferred} = bs_insert_is(Is1, Saves, Restores, XFrm, []),
@@ -668,59 +578,6 @@ bs_subst_ctx(#b_var{}=Var, CtxChain) ->
 bs_subst_ctx(Other, _CtxChain) ->
     Other.
 
-%% legacy_bs(St0) -> St.
-%%  Binary matching instructions in OTP 21 and earlier don't support
-%%  a Y register as destination. If St#st.use_bsm3 is false,
-%%  we will need to rewrite those instructions so that the result
-%%  is first put in an X register and then moved to a Y register
-%%  if the operation succeeded.
-
-legacy_bs(#st{use_bsm3=false,ssa=Blocks0,cnt=Count0,res=Res}=St) ->
-    IsYreg = maps:from_list([{V,true} || {V,{y,_}} <- Res]),
-    Linear0 = beam_ssa:linearize(Blocks0),
-    {Linear,Count} = legacy_bs(Linear0, IsYreg, Count0, #{}, []),
-    Blocks = maps:from_list(Linear),
-    St#st{ssa=Blocks,cnt=Count};
-legacy_bs(#st{use_bsm3=true}=St) -> St.
-
-legacy_bs([{L,Blk}|Bs], IsYreg, Count0, Copies0, Acc) ->
-    #b_blk{is=Is0,last=Last} = Blk,
-    Is1 = case Copies0 of
-              #{L:=Copy} -> [Copy|Is0];
-              #{} -> Is0
-          end,
-    {Is,Count,Copies} = legacy_bs_is(Is1, Last, IsYreg, Count0, Copies0, []),
-    legacy_bs(Bs, IsYreg, Count, Copies, [{L,Blk#b_blk{is=Is}}|Acc]);
-legacy_bs([], _IsYreg, Count, _Copies, Acc) ->
-    {Acc,Count}.
-
-legacy_bs_is([#b_set{op=Op,dst=Dst}=I0,
-              #b_set{op=succeeded,dst=SuccDst,args=[Dst]}=SuccI0],
-             Last, IsYreg, Count0, Copies0, Acc) ->
-    NeedsFix = is_map_key(Dst, IsYreg) andalso
-        case Op of
-            bs_get -> true;
-            bs_init -> true;
-            _ -> false
-        end,
-    case NeedsFix of
-        true ->
-            TempDst = #b_var{name={'@bs_temp_dst',Count0}},
-            Count = Count0 + 1,
-            I = I0#b_set{dst=TempDst},
-            SuccI = SuccI0#b_set{args=[TempDst]},
-            Copy = #b_set{op=copy,dst=Dst,args=[TempDst]},
-            #b_br{bool=SuccDst,succ=SuccL} = Last,
-            Copies = Copies0#{SuccL=>Copy},
-            legacy_bs_is([], Last, IsYreg, Count, Copies, [SuccI,I|Acc]);
-        false ->
-            legacy_bs_is([], Last, IsYreg, Count0, Copies0, [SuccI0,I0|Acc])
-    end;
-legacy_bs_is([I|Is], Last, IsYreg, Count, Copies, Acc) ->
-    legacy_bs_is(Is, Last, IsYreg, Count, Copies, [I|Acc]);
-legacy_bs_is([], _Last, _IsYreg, Count, Copies, Acc) ->
-    {reverse(Acc),Count,Copies}.
-
 %% sanitize(St0) -> St.
 %%  Remove constructs that can cause problems later:
 %%
@@ -1109,29 +966,6 @@ match_fail_stk(T, [#b_set{op=Op}=I|Is], IAcc, VAcc)
     match_fail_stk(T, Is, [I|IAcc], VAcc);
 match_fail_stk(_, _, _, _) -> none.
 
-%%%
-%%% Fix tuples.
-%%%
-
-%% fix_tuples(St0) -> St.
-%%  If compatibility with a previous version of Erlang has been
-%%  requested, tuple creation must be split into two instruction to
-%%  mirror the the way tuples are created in BEAM prior to OTP 22.
-%%  Each put_tuple instruction is split into put_tuple_arity followed
-%%  by put_tuple_elements.
-
-fix_tuples(#st{ssa=Blocks0,cnt=Count0}=St) ->
-    F = fun (#b_set{op=put_tuple,args=Args}=Put, C0) ->
-                Arity = #b_literal{val=length(Args)},
-                {Ignore,C} = new_var('@ssa_ignore', C0),
-                {[Put#b_set{op=put_tuple_arity,args=[Arity]},
-                  #b_set{dst=Ignore,op=put_tuple_elements,args=Args}],C};
-           (I, C) -> {[I],C}
-        end,
-    RPO = beam_ssa:rpo(Blocks0),
-    {Blocks,Count} = beam_ssa:flatmapfold_instrs(F, RPO, Count0, Blocks0),
-    St#st{ssa=Blocks,cnt=Count}.
-
 %%%
 %%% Introduce the set_tuple_element instructions to make
 %%% multiple-field record updates faster.
@@ -2019,10 +1853,6 @@ copy_retval_2([L|Ls], Yregs, Copy0, Blocks0, Count0) ->
 copy_retval_2([], _Yregs, none, Blocks, Count) ->
     {Blocks,Count}.
 
-copy_retval_is([#b_set{op=put_tuple_elements,args=Args0}=I0], false, _Yregs,
-           Copy, Count, Acc) ->
-    I = I0#b_set{args=copy_sub_args(Args0, Copy)},
-    {reverse(Acc, [I|acc_copy([], Copy)]),Count};
 copy_retval_is([#b_set{op=Op}=I0], false, Yregs, Copy, Count0, Acc0)
   when Op =:= call; Op =:= old_make_fun ->
     {I,Count,Acc} = place_retval_copy(I0, Yregs, Copy, Count0, Acc0),
@@ -2663,12 +2493,9 @@ reserve_zreg([#b_set{op=Op,dst=Dst} | Is], Last, ShortLived, A) ->
 reserve_zreg([], _, _, A) -> A.
 
 use_zreg(bs_match_string) -> yes;
-use_zreg(bs_save) -> yes;
-use_zreg(bs_restore) -> yes;
 use_zreg(bs_set_position) -> yes;
 use_zreg(kill_try_tag) -> yes;
 use_zreg(landingpad) -> yes;
-use_zreg(put_tuple_elements) -> yes;
 use_zreg(recv_marker_bind) -> yes;
 use_zreg(recv_marker_clear) -> yes;
 use_zreg(remove_message) -> yes;
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 0e343d7533..4c9122d2c6 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -847,8 +847,6 @@ vi({bs_start_match4,Fail,Live,Src,Dst}, Vst) ->
     validate_bs_start_match(Fail, Live, 0, Src, Dst, Vst);
 vi({test,bs_start_match3,{f,_}=Fail,Live,[Src],Dst}, Vst) ->
     validate_bs_start_match(Fail, Live, 0, Src, Dst, Vst);
-vi({test,bs_start_match2,{f,_}=Fail,Live,[Src,Slots],Dst}, Vst) ->
-    validate_bs_start_match(Fail, Live, Slots, Src, Dst, Vst);
 vi({test,bs_match_string,{f,Fail},[Ctx,Stride,{string,String}]}, Vst) ->
     true = is_bitstring(String),                %Assertion.
     validate_bs_skip(Fail, Ctx, Stride, Vst);
@@ -929,10 +927,6 @@ vi({test,_Op,{f,Lbl},Src}, Vst) ->
 %% Bit syntax positioning
 %%
 
-vi({bs_save2,Ctx,SavePoint}, Vst) ->
-    bsm_save(Ctx, SavePoint, Vst);
-vi({bs_restore2,Ctx,SavePoint}, Vst) ->
-    bsm_restore(Ctx, SavePoint, Vst);
 vi({bs_get_position, Ctx, Dst, Live}, Vst0) ->
     assert_type(#t_bs_context{}, Ctx, Vst0),
 
@@ -1843,41 +1837,6 @@ assert_unique_map_keys([_,_|_]=Ls) ->
 	false -> error(keys_not_unique)
     end.
 
-%%%
-%%% New binary matching instructions.
-%%%
-
-bsm_save(Reg, {atom,start}, Vst) ->
-    %% Save point refering to where the match started.
-    %% It is always valid. But don't forget to validate the context register.
-    assert_type(#t_bs_context{}, Reg, Vst),
-    Vst;
-bsm_save(Reg, SavePoint, Vst) ->
-    case get_movable_term_type(Reg, Vst) of
-        #t_bs_context{valid=Bits,slots=Slots}=Ctxt0 when SavePoint < Slots ->
-            Ctx = Ctxt0#t_bs_context{valid=Bits bor (1 bsl SavePoint),
-                                     slots=Slots},
-            override_type(Ctx, Reg, Vst);
-        _ ->
-            error({illegal_save, SavePoint})
-    end.
-
-bsm_restore(Reg, {atom,start}, Vst) ->
-    %% (Mostly) automatic save point refering to where the match started.
-    %% It is always valid. But don't forget to validate the context register.
-    assert_type(#t_bs_context{}, Reg, Vst),
-    Vst;
-bsm_restore(Reg, SavePoint, Vst) ->
-    case get_movable_term_type(Reg, Vst) of
-        #t_bs_context{valid=Bits,slots=Slots} when SavePoint < Slots ->
-            case Bits band (1 bsl SavePoint) of
-                0 -> error({illegal_restore, SavePoint, not_set});
-                _ -> Vst
-            end;
-        _ ->
-            error({illegal_restore, SavePoint, range})
-    end.
-
 bsm_stride({integer, Size}, Unit) ->
     Size * Unit;
 bsm_stride(_Size, Unit) ->
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index e4bf879fb2..84f18a2d41 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -24,23 +24,21 @@
 
 -export([module/2]).
 
--import(lists, [dropwhile/2,map/2,sort/1]).
+-import(lists, [dropwhile/2,sort/1]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_asm:module_code()}.
 
 module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
-    NoGetHdTl = proplists:get_bool(no_get_hd_tl, Opts),
     NoInitYregs = proplists:get_bool(no_init_yregs, Opts),
-    Fs = [function(F, NoGetHdTl, NoInitYregs) || F <- Fs0],
+    Fs = [function(F, NoInitYregs) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}, NoGetHdTl, NoInitYregs) ->
+function({function,Name,Arity,CLabel,Is0}, NoInitYregs) ->
     try
 	Is1 = undo_renames(Is0),
-        Is2 = maybe_eliminate_get_hd_tl(Is1, NoGetHdTl),
-        Is3 = maybe_eliminate_init_yregs(Is2, NoInitYregs),
-        Is = remove_redundant_lines(Is3),
+        Is2 = maybe_eliminate_init_yregs(Is1, NoInitYregs),
+        Is = remove_redundant_lines(Is2),
 	{function,Name,Arity,CLabel,Is}
     catch
         Class:Error:Stack ->
@@ -161,20 +159,6 @@ undo_rename({select,I,Reg,Fail,List}) ->
     {I,Reg,Fail,{list,List}};
 undo_rename(I) -> I.
 
-%%%
-%%% Eliminate get_hd/get_tl instructions if requested by
-%%% the no_get_hd_tl option.
-%%%
-
-maybe_eliminate_get_hd_tl(Is, true) ->
-    map(fun({get_hd,Cons,Hd}) ->
-                {get_list,Cons,Hd,{x,1022}};
-           ({get_tl,Cons,Tl}) ->
-                {get_list,Cons,{x,1022},Tl};
-           (I) -> I
-        end, Is);
-maybe_eliminate_get_hd_tl(Is, false) -> Is.
-
 %%%
 %%% Eliminate the init_yreg/1 instruction if requested by
 %%% the no_init_yregs option.
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index ef421c20e7..faed60e938 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -271,14 +271,6 @@ expand_opt(no_bsm4, Os) ->
     %% bsm4 instructions are only used when type optimization has determined
     %% that a match instruction won't fail.
     expand_opt(no_type_opt, Os);
-expand_opt(r18, Os) ->
-    expand_opt_before_21(Os);
-expand_opt(r19, Os) ->
-    expand_opt_before_21(Os);
-expand_opt(r20, Os) ->
-    expand_opt_before_21(Os);
-expand_opt(r21, Os) ->
-    expand_opt(r22, [no_put_tuple2 | expand_opt(no_bsm3, Os)]);
 expand_opt(r22, Os) ->
     expand_opt(r23, [no_shared_fun_wrappers, no_swap | expand_opt(no_bsm4, Os)]);
 expand_opt(r23, Os) ->
@@ -298,15 +290,10 @@ expand_opt(no_module_opt=O, Os) ->
     [O,no_recv_opt | Os];
 expand_opt(O, Os) -> [O|Os].
 
-expand_opt_before_21(Os) ->
-    [no_init_yregs, no_make_fun3, no_fun_opt,
-     no_shared_fun_wrappers, no_swap,
-     no_put_tuple2, no_get_hd_tl, no_ssa_opt_record,
-     no_utf8_atoms, no_recv_opt | expand_opt(no_bsm3, Os)].
-
-
 -spec format_error(error_description()) -> iolist().
 
+format_error({obsolete_option,Ver}) ->
+    io_lib:fwrite("the ~p option is no longer supported", [Ver]);
 format_error(no_crypto) ->
     "this system is not configured with crypto support.";
 format_error(bad_crypto_key) ->
@@ -1428,9 +1415,35 @@ expand_records(Code0, #compile{options=Opts}=St) ->
     Code = erl_expand_records:module(Code0, Opts),
     {ok,Code,St}.
 
-compile_directives(Forms, #compile{options=Opts0}=St) ->
-    Opts = expand_opts(flatten([C || {attribute,_,compile,C} <- Forms])),
-    {ok, Forms, St#compile{options=Opts ++ Opts0}}.
+compile_directives(Forms, #compile{options=Opts0}=St0) ->
+    Opts1 = expand_opts(flatten([C || {attribute,_,compile,C} <- Forms])),
+    Opts = Opts1 ++ Opts0,
+    St1 = St0#compile{options=Opts},
+    case any_obsolete_option(Opts) of
+        {yes,Opt} ->
+            Error = {St1#compile.ifile,[{none,?MODULE,{obsolete_option,Opt}}]},
+            St = St1#compile{errors=[Error|St1#compile.errors]},
+            {error,St};
+        no ->
+            {ok,Forms,St1}
+    end.
+
+any_obsolete_option([Opt|Opts]) ->
+    case is_obsolete(Opt) of
+        true -> {yes,Opt};
+        false -> any_obsolete_option(Opts)
+    end;
+any_obsolete_option([]) -> no.
+
+is_obsolete(r18) -> true;
+is_obsolete(r19) -> true;
+is_obsolete(r20) -> true;
+is_obsolete(r21) -> true;
+is_obsolete(no_bsm3) -> true;
+is_obsolete(no_get_hd_tl) -> true;
+is_obsolete(no_put_tuple2) -> true;
+is_obsolete(no_utf8_atoms) -> true;
+is_obsolete(_) -> false.
 
 core(Forms, #compile{options=Opts}=St) ->
     {ok,Core,Ws} = v3_core:module(Forms, Opts),
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index fafffdc03f..9c0fb13c84 100755
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -332,8 +332,8 @@ BEAM_FORMAT_NUMBER=0
 #
 68: -put_string/3
 69: put_list/3
-70: put_tuple/2
-71: put/1
+70: -put_tuple/2
+71: -put/1
 
 #
 # Raising errors.
@@ -438,14 +438,14 @@ BEAM_FORMAT_NUMBER=0
 
 # New bit syntax matching in R11B.
 
-116: bs_start_match2/5
+116: -bs_start_match2/5
 117: bs_get_integer2/7
 118: bs_get_float2/7
 119: bs_get_binary2/7
 120: bs_skip_bits2/5
 121: bs_test_tail2/3
-122: bs_save2/2
-123: bs_restore2/2
+122: -bs_save2/2
+123: -bs_restore2/2
 
 # New GC bifs introduced in R11B.
 
@@ -478,7 +478,7 @@ BEAM_FORMAT_NUMBER=0
 129: is_bitstr/2
 
 # R12B
-130: bs_context_to_binary/1
+130: -bs_context_to_binary/1
 131: bs_test_unit/3
 132: bs_match_string/4
 133: bs_init_writable/0
-- 
2.31.1

Places

File 1202-Remove-support-for-BEAM-files-compiled-before-OTP-22.patch of Package erlang (Revision bb9db9e8521e01495e35a8b04e76808f)

Places