File 1291-Consolidate-mandatory-distribution-flags-a... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1291-Consolidate-mandatory-distribution-flags-across-appl.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Currently displaying revision a0b3ae25eeaaf8007a46a3a2b2ca2729 , Show latest

From b94fde09ec9be03cc0a17e6d16a397f18680eb76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 7 Jun 2021 08:38:34 +0200
Subject: [PATCH 1/2] Consolidate mandatory distribution flags across
 applications

The three applications that supports Erlang distribution (erts,
erl_interface, and jinterface), do not agree which the mandatory
distribution flags are.

For example, DFLAG_NEW_FLOATS (support for the "new" external format
for floats introduced in R11B-5) is considered mandatory in
erl_interface, but not in the Erlang emulator. jinterface does not
test the flag, but encodes all floats in the new external format.

Update erts, erl_interface, and jinterface to all use the same set of
mandatory distribution flags.

Also make the following distribution flags mandatory:

* DFLAG_EXPORT_PTR_TAG
* DFLAG_BIT_BINARIES
* DFLAG_MAP_TAG

Support for them in erl_interface and jinterface was added in OTP 22
or earlier. Making them mandatory allows us to remove ugly fallback
code.
---
 erts/doc/src/erl_dist_protocol.xml            |  19 +-
 erts/emulator/beam/dist.h                     |  24 +-
 erts/emulator/beam/erl_bif_info.c             |   9 -
 erts/emulator/beam/external.c                 | 416 +-----------------
 erts/emulator/test/binary_SUITE.erl           |  25 --
 lib/erl_interface/src/connect/ei_connect.c    |  31 +-
 .../src/connect/ei_connect_int.h              |  15 +
 lib/erl_interface/src/misc/ei_compat.c        |   6 -
 lib/erl_interface/src/misc/ei_internal.h      |   2 -
 lib/erl_interface/test/ei_accept_SUITE.erl    |  26 +-
 lib/erl_interface/test/ei_tmo_SUITE.erl       |  43 +-
 .../otp/erlang/AbstractConnection.java        |  18 +-
 .../com/ericsson/otp/erlang/AbstractNode.java |  25 +-
 lib/kernel/test/erl_distribution_wb_SUITE.erl |  55 ++-
 14 files changed, 150 insertions(+), 564 deletions(-)

diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index 72a2fc17ba..0f3319d032 100644
--- a/erts/doc/src/erl_dist_protocol.xml
+++ b/erts/doc/src/erl_dist_protocol.xml
@@ -996,9 +996,9 @@ DiB == gen_digest(ChA, ICA)?
 </item>
 <tag><c>-define(DFLAG_FUN_TAGS,16#10).</c></tag>
 <item>
- The node uses separate tag for funs (lambdas) in the distribution
- protocol.
- <note>This flag will become mandatory in OTP 25.</note>
+ The node uses separate tags for funs (lambdas) in the
+ distribution protocol. This flag is mandatory. If not
+ present, the connection is refused.
 </item>
 <tag><c>-define(DFLAG_DIST_MONITOR_NAME,16#20).</c></tag>
 <item>
@@ -1024,20 +1024,21 @@ DiB == gen_digest(ChA, ICA)?
 <tag><c>-define(DFLAG_EXPORT_PTR_TAG,16#200).</c></tag>
 <item>
 	 The node understands the <seeguide marker="erl_ext_dist#EXPORT_EXT">
-	 <c>EXPORT_EXT</c></seeguide> tag.
- <note>This flag will become mandatory in OTP 25.</note>
+	 <c>EXPORT_EXT</c></seeguide> tag.
+ This flag is mandatory. If not present, the connection is refused.
+ 
 </item>
 <tag><c>-define(DFLAG_BIT_BINARIES,16#400).</c></tag>
 <item>
 	 The node understands the <seeguide marker="erl_ext_dist#BIT_BINARY_EXT">
-	 <c>BIT_BINARY_EXT</c></seeguide> tag.
- <note>This flag will become mandatory in OTP 25.</note>
+	 <c>BIT_BINARY_EXT</c></seeguide> tag.
+ This flag is mandatory. If not present, the connection is refused.
 </item>
 <tag><c>-define(DFLAG_NEW_FLOATS,16#800).</c></tag>
 <item>
 	 The node understands the <seeguide marker="erl_ext_dist#NEW_FLOAT_EXT">
-	 <c>NEW_FLOAT_EXT</c></seeguide> tag.
- <note>This flag will become mandatory in OTP 25.</note>
+	 <c>NEW_FLOAT_EXT</c></seeguide> tag. This flag is
+	 mandatory. If not present, the connection is refused.
 </item>
 <tag><c>-define(DFLAG_UNICODE_IO,16#1000).</c></tag>
 <item>
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index b5c8d4d5f9..4db0cea1e6 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -64,19 +64,22 @@
 
 /* Mandatory flags for distribution */
 #define DFLAG_DIST_MANDATORY (DFLAG_EXTENDED_REFERENCES \
+ | DFLAG_FUN_TAGS \
 | DFLAG_EXTENDED_PIDS_PORTS \
 			 | DFLAG_UTF8_ATOMS \
 			 | DFLAG_NEW_FUN_TAGS \
- | DFLAG_BIG_CREATION)
+ | DFLAG_BIG_CREATION \
+ | DFLAG_NEW_FLOATS \
+ | DFLAG_MAP_TAG \
+ | DFLAG_EXPORT_PTR_TAG \
+ | DFLAG_BIT_BINARIES)
 
 /*
 * Additional optimistic flags when encoding toward pending connection.
 * If remote node (erl_interface) does not support these then we may need
 * to transcode messages enqueued before connection setup was finished.
 */
-#define DFLAG_DIST_HOPEFULLY (DFLAG_EXPORT_PTR_TAG \
- | DFLAG_BIT_BINARIES \
- | DFLAG_DIST_MONITOR \
+#define DFLAG_DIST_HOPEFULLY (DFLAG_DIST_MONITOR \
 | DFLAG_DIST_MONITOR_NAME \
 | DFLAG_SPAWN \
 			 | DFLAG_ALIAS			\
@@ -84,13 +87,9 @@
 
 /* Our preferred set of flags. Used for connection setup handshake */
 #define DFLAG_DIST_DEFAULT (DFLAG_DIST_MANDATORY | DFLAG_DIST_HOPEFULLY \
- | DFLAG_FUN_TAGS \
- | DFLAG_NEW_FLOATS \
 | DFLAG_UNICODE_IO \
 | DFLAG_DIST_HDR_ATOM_CACHE \
 | DFLAG_SMALL_ATOM_TAGS \
- | DFLAG_UTF8_ATOMS \
- | DFLAG_MAP_TAG \
 | DFLAG_SEND_SENDER \
 | DFLAG_BIG_SEQTRACE_LABELS \
 | DFLAG_EXIT_PAYLOAD \
@@ -114,14 +113,7 @@
 #define DFLAG_DIST_STRICT_ORDER DFLAG_DIST_HDR_ATOM_CACHE
 
 /* All flags that should be enabled when term_to_binary/1 is used. */
-#define TERM_TO_BINARY_DFLAGS (DFLAG_EXTENDED_REFERENCES	\
-			 | DFLAG_NEW_FUN_TAGS		\
-			 | DFLAG_NEW_FLOATS		\
-			 | DFLAG_EXTENDED_PIDS_PORTS	\
-			 | DFLAG_EXPORT_PTR_TAG		\
-			 | DFLAG_BIT_BINARIES \
-			 | DFLAG_MAP_TAG \
- | DFLAG_BIG_CREATION)
+#define TERM_TO_BINARY_DFLAGS DFLAG_NEW_FLOATS
 
 /* opcodes used in distribution messages */
 enum dop {
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index c17906040b..3a1d79662e 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -4353,15 +4353,6 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 		 BIF_RET(res);
 		}
 	 }
-	 else if (ERTS_IS_ATOM_STR("term_to_binary_tuple_fallbacks", tp[1])) {
-		Uint64 dflags = (TERM_TO_BINARY_DFLAGS
- & ~DFLAG_EXPORT_PTR_TAG
- & ~DFLAG_BIT_BINARIES);
-		Eterm res = erts_term_to_binary(BIF_P, tp[2], 0, dflags);
- if (is_value(res))
- BIF_RET(res);
- BIF_ERROR(BIF_P, SYSTEM_LIMIT);
-	 }
 	 else if (ERTS_IS_ATOM_STR("dist_ctrl", tp[1])) {
 		Eterm res = am_undefined;
 		DistEntry *dep = erts_sysname_to_connected_dist_entry(tp[2]);
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 6bfd9fa825..bc9afbc974 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -123,10 +123,6 @@ static ErtsExtSzRes encode_size_struct_int(TTBSizeContext*, ErtsAtomCacheMap *ac
 static Export binary_to_term_trap_export;
 static BIF_RETTYPE binary_to_term_trap_1(BIF_ALIST_1);
 static Sint transcode_dist_obuf(ErtsDistOutputBuf*, DistEntry*, Uint64 dflags, Sint reds);
-static byte *hopefull_bit_binary(TTBEncodeContext* ctx, byte **epp, Binary *pb_val, Eterm pb_term,
- byte *bytes, byte bitoffs, byte bitsize, Uint sz);
-static void hopefull_export(TTBEncodeContext* ctx, byte **epp, Export* exp, Uint32 dflags,
- struct erl_off_heap_header** off_heap);
 static void store_in_vec(TTBEncodeContext *ctx, byte *ep, Binary *ohbin, Eterm ohpb,
 byte *ohp, Uint ohsz);
 
@@ -230,7 +226,6 @@ insert_acache_map(ErtsAtomCacheMap *acmp, Eterm atom, Uint64 dflags)
 if (acmp && acmp->sz < ERTS_MAX_INTERNAL_ATOM_CACHE_ENTRIES) {
 	int ix;
 	ASSERT(acmp->hdr_sz < 0);
- ASSERT(dflags & DFLAG_UTF8_ATOMS);
 	ix = atom2cix(atom);
 	if (acmp->cache[ix].iix < 0) {
 	 acmp->cache[ix].iix = acmp->sz;
@@ -268,7 +263,6 @@ erts_finalize_atom_cache_map(ErtsAtomCacheMap *acmp, Uint64 dflags)
 	int i;
 	int sz = 0;
 	int min_sz;
- ASSERT(dflags & DFLAG_UTF8_ATOMS);
 	ASSERT(acmp->hdr_sz < 0);
 	/* Make sure cache update instructions fit */
 	min_sz = (2+4)*acmp->sz;
@@ -438,7 +432,6 @@ Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf* ob,
 int long_atoms;
 Uint64 seq_id = 0, frag_id = 0;
 register byte *ep = ob->eiov->iov[1].iov_base;
- ASSERT(dflags & DFLAG_UTF8_ATOMS);
 
 /*
 * The buffer can have different layouts at this point depending on
@@ -852,9 +845,6 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 ASSERT(dep);
 erts_de_rlock(dep);
 
- ASSERT(dep->dflags & DFLAG_UTF8_ATOMS);
-
-
 if ((dep->state != ERTS_DE_STATE_CONNECTED &&
 dep->state != ERTS_DE_STATE_PENDING)
 || dep->connection_id != conn_id) {
@@ -3248,8 +3238,6 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 			 ? INTERNAL_LOCAL_SYSNAME : ref_node_name(obj));
 Uint32 creation = ref_creation(obj);
 
-	 ASSERT(dflags & DFLAG_EXTENDED_REFERENCES);
-
 	 erts_magic_ref_save_bin(obj);
 
 *ep++ = NEWER_REFERENCE_EXT;
@@ -3498,72 +3486,23 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 data_dst = ep;
 ep += j;
 }
-		} else if (dflags & DFLAG_BIT_BINARIES) {
-		 /* Bit-level binary. */
- if (dflags & DFLAG_PENDING_CONNECT) {
-			ASSERT(ctx);
- j = off_heap_bytesize;
- if (!j) {
- pb_val = NULL;
- pb_term = THE_NON_VALUE;
- j = binary_size(obj);
- }
- data_dst = hopefull_bit_binary(ctx, &ep, pb_val, pb_term,
- bytes, bitoffs, bitsize, j);
- if (!data_dst)
- break; /* off heap binary referred... */
- ASSERT(!off_heap_bytesize);
- off_heap_tail = 0;
- /*
- * Trailing bits already written by hopefull_bit_binary();
- * now go copy all whole octets...
- */
- bitsize = 0;
- }
- else {
- *ep++ = BIT_BINARY_EXT;
- j = binary_size(obj);
- put_int32((j+1), ep);
- ep += 4;
- *ep++ = bitsize;
- if (off_heap_bytesize) {
- /* trailing bits */
- ep[0] = 0;
- copy_binary_to_buffer(ep, 0, bytes + j, 0, bitsize);
- off_heap_tail = 1;
- }
- else {
- ep[j] = 0;	/* Zero unused bits at end of binary */
- data_dst = ep;
- ep += j + 1;
- }
- }
 		} else {
-		 /*
-		 * Bit-level binary, but the receiver doesn't support it.
-		 * Build a tuple instead.
-		 */
-		 *ep++ = SMALL_TUPLE_EXT;
-		 *ep++ = 2;
-		 *ep++ = BINARY_EXT;
-		 j = binary_size(obj);
-		 put_int32((j+1), ep);
-		 ep += 4;
- 
+		 /* Bit-level binary. */
+ *ep++ = BIT_BINARY_EXT;
+ j = binary_size(obj);
+ put_int32((j+1), ep);
+ ep += 4;
+ *ep++ = bitsize;
 if (off_heap_bytesize) {
 /* trailing bits */
 ep[0] = 0;
 copy_binary_to_buffer(ep, 0, bytes + j, 0, bitsize);
- ep[1] = SMALL_INTEGER_EXT;
- ep[2] = bitsize;
- off_heap_tail = 3;
+ off_heap_tail = 1;
 }
 else {
- ep[j] = 0; /* Zero unused bits at end of binary */
+ ep[j] = 0;	/* Zero unused bits at end of binary */
 data_dst = ep;
- ep += j+1;
- *ep++ = SMALL_INTEGER_EXT;
- *ep++ = bitsize;
+ ep += j + 1;
 }
 		}
 if (off_heap_bytesize) {
@@ -3584,28 +3523,11 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	case EXPORT_DEF:
 	 {
 		Export* exp = *((Export **) (export_val(obj) + 1));
- if (dflags & DFLAG_PENDING_CONNECT) {
-		 ASSERT(ctx);
- hopefull_export(ctx, &ep, exp, dflags, off_heap);
-		}
- else if ((dflags & DFLAG_EXPORT_PTR_TAG) != 0) {
-		 *ep++ = EXPORT_EXT;
-		 ep = enc_atom(acmp, exp->info.mfa.module, ep, dflags);
-		 ep = enc_atom(acmp, exp->info.mfa.function, ep, dflags);
-		 ep = enc_term(acmp, make_small(exp->info.mfa.arity),
- ep, dflags, off_heap);
-		} else {
-		 /* Tag, arity */
-		 *ep++ = SMALL_TUPLE_EXT;
-		 put_int8(2, ep);
-		 ep += 1;
-
-		 /* Module name */
-		 ep = enc_atom(acmp, exp->info.mfa.module, ep, dflags);
-
-		 /* Function name */
-		 ep = enc_atom(acmp, exp->info.mfa.function, ep, dflags);
-		}
+ *ep++ = EXPORT_EXT;
+ ep = enc_atom(acmp, exp->info.mfa.module, ep, dflags);
+ ep = enc_atom(acmp, exp->info.mfa.function, ep, dflags);
+ ep = enc_term(acmp, make_small(exp->info.mfa.arity),
+ ep, dflags, off_heap);
 		break;
 	 }
 	 break;
@@ -3614,7 +3536,6 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 		ErlFunThing* funp = (ErlFunThing *) fun_val(obj);
 		int ei;
 
-		ASSERT(dflags & DFLAG_NEW_FUN_TAGS);
 *ep++ = NEW_FUN_EXT;
 WSTACK_PUSH2(s, ENC_PATCH_FUN_SIZE,
 (UWord) ep); /* Position for patching in size */
@@ -3775,123 +3696,6 @@ store_in_vec(TTBEncodeContext *ctx,
 }
 }
 
-static byte *
-begin_hopefull_data(TTBEncodeContext *ctx, byte *ep)
-{
- store_in_vec(ctx, ep, NULL, THE_NON_VALUE, NULL, 0);
- ASSERT(ERTS_NO_HIX == get_uint32(ctx->hopefull_ixp));
- put_int32(ctx->vlen, ctx->hopefull_ixp);
- ctx->hopefull_ixp = ep;
- put_int32(ERTS_NO_HIX, ep);
- ep += 4;
- ctx->cptr = ep;
- return ep;
-}
-
-static byte *
-end_hopefull_data(TTBEncodeContext *ctx, byte *ep, Uint fallback_size)
-{
- Uint sz;
- store_in_vec(ctx, ep, NULL, THE_NON_VALUE, NULL, 0);
- /*
- * Reserve extra room for fallback if needed. The four
- * bytes used for hopefull index can be used for
- * fallback encoding...
- */
- sz = ep - ctx->hopefull_ixp;
- if (fallback_size > sz) {
- ep += fallback_size - sz;
- ctx->cptr = ep;
- }
- return ep;
-}
-
-static byte *
-hopefull_bit_binary(TTBEncodeContext* ctx, byte **epp, Binary *pb_val, Eterm pb_term,
- byte *bytes, byte bitoffs, byte bitsize, Uint sz)
-{
- byte *octets, *ep = *epp;
-
- ctx->hopefull_flags |= DFLAG_BIT_BINARIES;
- 
- /*
- * The fallback:
- *
- * SMALL_TUPLE_EXT - 1 byte
- * 2 - 1 byte
- * BINARY_EXT - 1 byte
- * whole octet size ('sz') - 4 byte
- * whole octets - 'sz' bytes
- * trailing bits - 1 byte
- * SMALL_INTEGER_EXT - 1 byte
- * bitsize - 1 byte
- */
-
- /* bit binary prelude in one hopefull data element */
- ep = begin_hopefull_data(ctx, ep);
- *ep++ = BIT_BINARY_EXT;
- put_int32((sz+1), ep);
- ep += 4;
- *ep++ = bitsize;
- ep = end_hopefull_data(ctx, ep, 1+1+1+4);
-
- /* All whole octets... */
- if (pb_val) {
- octets = NULL;
- store_in_vec(ctx, ep, pb_val, pb_term, bytes, sz);
- }
- else {
- /* ... will be copied here afterwards */
- octets = ep;
- ep += sz;
- }
-
- /* copy trailing bits into new hopefull data element */
- ep = begin_hopefull_data(ctx, ep);
- *ep = 0; /* Clear the bit in the byte */
-
- copy_binary_to_buffer(ep, 0, bytes + sz, bitoffs, bitsize);
- ep++;
-
- ep = end_hopefull_data(ctx, ep, 1+1+1);
- *epp = ep;
- 
- return octets;
-}
-
-static void
-hopefull_export(TTBEncodeContext* ctx, byte **epp, Export* exp, Uint32 dflags,
- struct erl_off_heap_header** off_heap)
-{
- Uint fallback_sz;
- byte *ep = *epp, *mod_start;
-
- /*
- * The fallback:
- *
- * SMALL_TUPLE_EXT - 1 byte
- * 2 - 1 byte
- * module atom... - M bytes
- * function atom... - F bytes
- */
-
- ctx->hopefull_flags |= DFLAG_EXPORT_PTR_TAG;
-
- ep = begin_hopefull_data(ctx, ep);
- 
- *ep++ = EXPORT_EXT;
- mod_start = ep;
- ep = enc_atom(NULL, exp->info.mfa.module, ep, dflags);
- ep = enc_atom(NULL, exp->info.mfa.function, ep, dflags);
- fallback_sz = 2 + (ep - mod_start);
- ep = enc_term(NULL, make_small(exp->info.mfa.arity),
- ep, dflags, off_heap);
-
- ep = end_hopefull_data(ctx, ep, fallback_sz);
-
- *epp = ep;
-}
-
 /** @brief Is it a list of bytes not longer than MAX_STRING_LEN?
 * @param lenp out: string length or number of list cells traversed
 * @return true/false
@@ -5067,7 +4871,6 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	 break;
 case EXTERNAL_REF_DEF:
 	case REF_DEF:
-	 ASSERT(dflags & DFLAG_EXTENDED_REFERENCES);
 	 i = ref_no_numbers(obj);
 	 result += (1 + 2 + encode_size_struct2(acmp, ref_node_name(obj), dflags) +
 		 4 + 4*i);
@@ -5223,21 +5026,12 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 + 4 /* size */);
 trailing_result = 0;
 }
- else if (dflags & DFLAG_BIT_BINARIES) {
+ else {
 result += (1 /* BIT_BINARY_EXT */
 + 4 /* size */
 + 1 /* trailing bitsize */);
 trailing_result = 1 /* trailing bits */;
 }
- else {
- /* sigh... */
- result += (1 /* SMALL_TUPLE_EXT */
- + 1 /* 2 tuple size */
- + 1 /* BINARY_EXT */
- + 4 /* binary size */);
- trailing_result = (1 /* SMALL_INTEGER_EXT */
- + 1 /* bitsize */);
- }
 csz = result - ctx->last_result;
 ctx->last_result = result;
 result += trailing_result;
@@ -5250,7 +5044,6 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 ctx->extra_size += bin_size;
 
 if (dflags & DFLAG_PENDING_CONNECT) {
- ASSERT(dflags & DFLAG_BIT_BINARIES);
 			 ASSERT(ctx);
 vlen += 2; /* for hopefull prolog and epilog */
 result += (4 /* for hopefull prolog (see below) */
@@ -5271,7 +5064,6 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 /* This is the odd case when we have an un-aligned bit-string
 during a pending connect. */
 Uint csz;
- ASSERT(dflags & DFLAG_BIT_BINARIES);
 		ASSERT(ctx);
 csz = result - ctx->last_result;
 /* potentially multiple elements leading up to binary */
@@ -5296,20 +5088,15 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 result += 4 + 1;
 ctx->last_result = result;
 }
- else if (dflags & DFLAG_BIT_BINARIES) {
- result += 1 + 4 + 1 + bin_size + 1;
- }
 else {
- /* Sigh... */
- result += 1 + 1 + 1 + 4 + bin_size + 1 + 1 + 1;
+ result += 1 + 4 + 1 + bin_size + 1;
 }
 	 break;
 }
 	case FUN_DEF:
 	 {
 		ErlFunThing* funp = (ErlFunThing *) fun_val(obj);
-		
- ASSERT(dflags & DFLAG_NEW_FUN_TAGS);
+
 result += 20+1+1+4;	/* New ID + Tag */
 result += 4; /* Length field (number of free variables */
 result += encode_size_struct2(acmp, funp->creator, dflags);
@@ -5813,10 +5600,8 @@ Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
 ErlIOVec* eiov = ob->eiov;
 SysIOVec* iov = eiov->iov;
 byte *hdr;
- Uint64 hopefull_flags;
- Uint32 hopefull_ix, payload_ix;
+ Uint32 payload_ix;
 Sint start_r, r;
- Uint new_len;
 byte *ep;
 
 if (reds < 0)
@@ -5882,11 +5667,9 @@ Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
 return reds;
 }
 
+ /* Currently, the hopefull flags and IX are not used. */
 hdr++;
- hopefull_flags = get_int64(hdr);
-
 hdr += 8;
- hopefull_ix = get_int32(hdr);
 
 if ((~dflags & DFLAG_SPAWN)
 && ep[0] == SMALL_TUPLE_EXT
@@ -6064,167 +5847,6 @@ Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
 
 start_r = r = reds*ERTS_TRANSCODE_REDS_FACT;
 
- if (~dflags & hopefull_flags) {
-
- while (hopefull_ix != ERTS_NO_HIX) {
- Uint32 new_hopefull_ix;
- 
- if (r <= 0) { /* yield... */
- /* save current hopefull_ix... */
- ep = (byte *) iov[1].iov_base;
- ep += 5;
- put_int32(hopefull_ix, ep);
- return -1;
- }
-
- /* Read next hopefull index */
- ep = (byte *) iov[hopefull_ix].iov_base;
- ep -= 4;
- new_hopefull_ix = get_int32(ep);
- ASSERT(new_hopefull_ix == ERTS_NO_HIX
- || (hopefull_ix < new_hopefull_ix
- && new_hopefull_ix < eiov->vsize));
- 
- ep = (byte *) iov[hopefull_ix].iov_base;
- switch (*ep) {
-
- case EXPORT_EXT: {
- byte *start_ep, *end_ep;
- Eterm module, function;
- if (!(hopefull_flags & DFLAG_EXPORT_PTR_TAG))
- break;
- /* Read original encoding... */
- ep++;
- start_ep = ep;
- ep = (byte*)dec_atom(NULL, ep, &module);
- ASSERT(ep && is_atom(module));
- ep = (byte*)dec_atom(NULL, ep, &function);
- ASSERT(ep && is_atom(function));
- end_ep = ep;
- ASSERT(*ep == SMALL_INTEGER_EXT
- || *ep == INTEGER_EXT
- || *ep == SMALL_BIG_EXT
- || *ep == LARGE_BIG_EXT);
-
- /*
- * module and function atoms are encoded
- * between start_ep and end_ep. Prepend a
- * 2-tuple tag before the atoms and
- * remove arity at end.
- */
-
- /* write fallback */
-
- ep = start_ep;
- ep--;
- put_int8(2, ep);
- ep--;
- *ep = SMALL_TUPLE_EXT;
-
- iov[hopefull_ix].iov_base = ep;
-
- /* Update iov sizes... */
- new_len = end_ep - ep;
- eiov->size -= iov[hopefull_ix].iov_len;
- eiov->size += new_len;
- iov[hopefull_ix].iov_len = new_len;
- r--;
- break;
- }
-
- case BIT_BINARY_EXT: {
- Uint bin_sz;
- byte bitsize, epilog_byte;
- ASSERT(hopefull_ix != ERTS_NO_HIX);
- if (!(hopefull_flags & DFLAG_BIT_BINARIES)) {
- /* skip to epilog... */
- hopefull_ix = new_hopefull_ix;
- ep = (byte *) iov[hopefull_ix].iov_base;
- ep -= 4;
- new_hopefull_ix = get_int32(ep);
- ASSERT(new_hopefull_ix == ERTS_NO_HIX
- || (hopefull_ix < new_hopefull_ix
- && new_hopefull_ix < eiov->vsize));
- break;
- }
-
- /* read original encoded prolog... */
- ep++;
- bin_sz = get_uint32(ep);
- ep += 4;
- bitsize = *ep++;
-
- /* write fallback prolog... */
- iov[hopefull_ix].iov_base = &((byte*)iov[hopefull_ix].iov_base)[-4];
- ep = (byte *) iov[hopefull_ix].iov_base;
-
- *ep++ = SMALL_TUPLE_EXT;
- *ep++ = 2;
- *ep++ = BINARY_EXT;
- put_int32(bin_sz, ep);
- ep += 4;
-
- /* Update iov sizes... */
- new_len = ep - (byte *) iov[hopefull_ix].iov_base;
- eiov->size -= iov[hopefull_ix].iov_len;
- eiov->size += new_len;
- iov[hopefull_ix].iov_len = new_len;
- r--;
-#ifdef DEBUG
- /*
- * The binary data between the prolog and the
- * epilog should be of size 'bin_sz - 1' and
- * exists in the iov elements between prolog
- * and epilog...
- */
- {
- Uint ix, debug_bin_sz = 0;
- for (ix = hopefull_ix+1; ix < new_hopefull_ix; ix++)
- debug_bin_sz += iov[ix].iov_len;
- ASSERT(debug_bin_sz == bin_sz - 1);
- }
-#endif
- /* jump to epilog... */
- hopefull_ix = new_hopefull_ix;
- ep = (byte *) iov[hopefull_ix].iov_base;
-
- /* read original encoded epilog... */
- epilog_byte = *ep;
-
- ASSERT(1 == iov[hopefull_ix].iov_len);
-
- iov[hopefull_ix].iov_base = &((byte*)iov[hopefull_ix].iov_base)[-4];
- ep = (byte *) iov[hopefull_ix].iov_base;
- new_hopefull_ix = get_int32(ep);
- ASSERT(new_hopefull_ix == ERTS_NO_HIX
- || (hopefull_ix < new_hopefull_ix
- && new_hopefull_ix < eiov->vsize));
- 
- /* write fallback epilog... */
-
- *ep++ = epilog_byte;
- *ep++ = SMALL_INTEGER_EXT;
- *ep++ = bitsize;
-
- /* Update iov sizes... */
- new_len = ep - (byte *) iov[hopefull_ix].iov_base;
- eiov->size -= iov[hopefull_ix].iov_len;
- eiov->size += new_len;
- iov[hopefull_ix].iov_len = new_len;
- r--;
- break;
- }
-
- default:
- ERTS_INTERNAL_ERROR("Unexpected external tag");
- break;
- }
-
- hopefull_ix = new_hopefull_ix;
- r--;
- }
- }
-
 /*
 * Replace hopefull data header with actual header...
 */
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 46434a8c1f..d71d77370f 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -69,7 +69,6 @@
 	 ordering/1,unaligned_order/1,gc_test/1,
 	 bit_sized_binary_sizes/1,
 	 otp_6817/1,deep/1,
- term2bin_tuple_fallbacks/1,
 robustness/1,otp_8117/1,
 	 otp_8180/1, trapping/1, large/1,
 	 error_after_yield/1, cmp_old_impl/1,
@@ -98,7 +97,6 @@ all() ->
 otp_5484, otp_5933,
 ordering, unaligned_order, gc_test,
 bit_sized_binary_sizes, otp_6817, otp_8117, deep,
- term2bin_tuple_fallbacks,
 robustness, otp_8180, trapping, large,
 error_after_yield, cmp_old_impl].
 
@@ -1563,29 +1561,6 @@ deep_roundtrip(T) ->
 B = term_to_binary(T),
 T = binary_to_term(B).
 
-term2bin_tuple_fallbacks(Config) when is_list(Config) ->
- erts_debug:set_internal_state(available_internal_state, true),
-
- term2bin_tf(fun ?MODULE:all/1),
- term2bin_tf(<<1:1>>),
- term2bin_tf(<<90,80:7>>),
-
- erts_debug:set_internal_state(available_internal_state, false),
- ok.
-
-term2bin_tf(Term) ->
- Tuple = case Term of
- Fun when is_function(Fun) ->
- {type, external} = erlang:fun_info(Fun, type),
- {module,M} = erlang:fun_info(Fun, module),
- {name,F} = erlang:fun_info(Fun, name),
- {M,F};
- BS when bit_size(BS) rem 8 =/= 0 ->
- Bits = bit_size(BS) rem 8,
- {<<BS/bitstring, 0:(8-Bits)>>, Bits}
- end,
- Tuple = binary_to_term_stress(erts_debug:get_internal_state({term_to_binary_tuple_fallbacks,Term})).
-
 %% Test non-standard encodings never generated by term_to_binary/1
 %% but recognized by binary_to_term/1.
 
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 3b989c0c46..1d9f2eab8e 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -2279,10 +2279,6 @@ static DistFlags preferred_flags(void)
 | DFLAG_HANDSHAKE_23
 | DFLAG_V4_NC
 | DFLAG_UNLINK_ID;
- if (ei_internal_use_21_bitstr_expfun()) {
- flags &= ~(DFLAG_EXPORT_PTR_TAG
- | DFLAG_BIT_BINARIES);
- }
 return flags;
 }
 
@@ -2512,22 +2508,9 @@ static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
 goto error;
 }
 
- if (!(*flags & DFLAG_EXTENDED_REFERENCES)) {
-	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE peer cannot "
-		 "handle extended references");
-	goto error;
- }
-
- if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)) {
-	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE peer cannot "
-		 "handle extended pids and ports");
-	erl_errno = EIO;
-	goto error;
- }
-	 
- if (!(*flags & DFLAG_NEW_FLOATS)) {
+ if ((*flags & DFLAG_DIST_MANDATORY) != DFLAG_DIST_MANDATORY) {
 	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE peer cannot "
-		 "handle binary float encoding");
+		 "handle all mandatory capabilities");
 	goto error;
 }
 
@@ -2918,15 +2901,9 @@ static int recv_name(ei_socket_callbacks *cbs, void *ctx,
 namelen = get16be(s);
 }
 
- if (!(*flags & DFLAG_EXTENDED_REFERENCES)) {
-	EI_TRACE_ERR0("recv_name","<- RECV_NAME peer cannot handle"
-		 "extended references");
-	goto error;
- }
-
- if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)) {
+ if ((*flags & DFLAG_DIST_MANDATORY) != DFLAG_DIST_MANDATORY) {
 	EI_TRACE_ERR0("recv_name","<- RECV_NAME peer cannot "
-		 "handle extended pids and ports");
+		 "handle all mandatory capabilities");
 	erl_errno = EIO;
 	goto error;
 }
diff --git a/lib/erl_interface/src/connect/ei_connect_int.h b/lib/erl_interface/src/connect/ei_connect_int.h
index 2d79b7321e..9b121d6cc9 100644
--- a/lib/erl_interface/src/connect/ei_connect_int.h
+++ b/lib/erl_interface/src/connect/ei_connect_int.h
@@ -92,6 +92,21 @@ typedef EI_ULONGLONG DistFlags;
 #define ERL_UNLINK_ID 35
 #define ERL_UNLINK_ID_ACK 36
 
+/*
+ * Mandatory flags for distribution. Keep them in sync with
+ * erts/emulator/beam/dist.h.
+ */
+#define DFLAG_DIST_MANDATORY (DFLAG_EXTENDED_REFERENCES \
+ | DFLAG_FUN_TAGS \
+ | DFLAG_EXTENDED_PIDS_PORTS \
+ | DFLAG_UTF8_ATOMS \
+ | DFLAG_NEW_FUN_TAGS \
+ | DFLAG_BIG_CREATION \
+ | DFLAG_NEW_FLOATS \
+ | DFLAG_MAP_TAG \
+ | DFLAG_EXPORT_PTR_TAG \
+ | DFLAG_BIT_BINARIES)
+
 
 ei_cnode *ei_fd_to_cnode(int fd);
 int ei_distversion(int fd);
diff --git a/lib/erl_interface/src/misc/ei_compat.c b/lib/erl_interface/src/misc/ei_compat.c
index e25a1a015d..99d6567a06 100644
--- a/lib/erl_interface/src/misc/ei_compat.c
+++ b/lib/erl_interface/src/misc/ei_compat.c
@@ -35,9 +35,3 @@ ei_set_compat_rel(unsigned rel)
 {
 compat_rel = rel;
 }
-
-int ei_internal_use_21_bitstr_expfun(void)
-{
- return compat_rel < 22;
-}
-
diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h
index 5b39e3dc37..781faed556 100644
--- a/lib/erl_interface/src/misc/ei_internal.h
+++ b/lib/erl_interface/src/misc/ei_internal.h
@@ -157,8 +157,6 @@ int ei_init_connect(void);
 
 void ei_trace_printf(const char *name, int level, const char *format, ...);
 
-int ei_internal_use_21_bitstr_expfun(void);
-
 int ei_get_cbs_ctx__(ei_socket_callbacks **cbs, void **ctx, int fd);
 
 #endif /* _EI_INTERNAL_H */
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index 612d6e1b81..9e72d0af79 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -43,9 +43,7 @@ init_per_testcase(Case, Config) ->
 runner:init_per_testcase(?MODULE, Case, Config).
 
 ei_accept(Config) when is_list(Config) ->
- [ei_accept_do(Config, CR, SI)
- || CR <- [0,21],
- SI <- [default, ussi]],
+ _ = [ei_accept_do(Config, 0, SI) || SI <- [default, ussi]],
 ok.
 
 ei_accept_do(Config, CompatRel, SockImpl) ->
@@ -58,34 +56,28 @@ ei_accept_do(Config, CompatRel, SockImpl) ->
 EINode = list_to_atom("c42@"++Myname),
 io:format("EINode ~p ~n", [EINode]),
 
- %% We take this opportunity to also test export-funs and bit-strings
- %% with (ugly) tuple fallbacks in OTP 21 and older.
+ %% We take this opportunity to also test export-funs and bit-strings.
 %% Test both toward pending connection and established connection.
- RealTerms = [<<1:1>>, fun lists:map/2],
- EncTerms = case CompatRel of
- 0 -> RealTerms;
- 21 -> [{<<128>>,1}, {lists,map}]
- end,
+ RealTerms = [<<1:1>>, fun lists:map/2],
 
 Self = self(),
 Funny = fun() -> hello end,
- TermToSend = {call, Self, "Test", Funny, RealTerms},
- TermToGet = {call, Self, "Test", Funny, EncTerms},
+ Terms = {call, Self, "Test", Funny, RealTerms},
 Port = 6543,
 {ok, ListenFd} = ei_publish(P, Port),
- {any, EINode} ! TermToSend,
+ {any, EINode} ! Terms,
 
 {ok, Fd, Node} = ei_accept(P, ListenFd),
 Node = node(),
 Got1 = ei_receive(P, Fd),
 
 %% Send again, now without auto-connect
- {any, EINode} ! TermToSend,
+ {any, EINode} ! Terms,
 Got2 = ei_receive(P, Fd),
 
- io:format("Sent ~p~nExp. ~p~nGot1 ~p~nGot2 ~p~n", [TermToSend, TermToGet, Got1, Got2]),
- TermToGet = Got1,
- TermToGet = Got2,
+ io:format("Sent ~p~nExp. ~p~nGot1 ~p~nGot2 ~p~n", [Terms, Terms, Got1, Got2]),
+ Terms = Got1,
+ Terms = Got2,
 
 runner:finish(P),
 ok.
diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl
index 8d8776949c..fe044fb34a 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE.erl
+++ b/lib/erl_interface/test/ei_tmo_SUITE.erl
@@ -359,17 +359,38 @@ make_and_check_dummy() ->
 R
 end).
 
--define(DFLAG_PUBLISHED,1).
--define(DFLAG_ATOM_CACHE,2).
--define(DFLAG_EXTENDED_REFERENCES,4).
--define(DFLAG_EXTENDED_PIDS_PORTS,16#100).
--define(DFLAG_NEW_FLOATS,16#800).
--define(DFLAG_DIST_MONITOR,8).
--define(DFLAG_HANDSHAKE_23,16#1000000).
-
-%% From R9 and forward extended references is compulsory
-%% From 14 and forward new float is compulsory
--define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor ?DFLAG_EXTENDED_PIDS_PORTS bor ?DFLAG_NEW_FLOATS)).
+-define(DFLAG_PUBLISHED, 1).
+-define(DFLAG_ATOM_CACHE, 2).
+-define(DFLAG_EXTENDED_REFERENCES, 4).
+-define(DFLAG_DIST_MONITOR, 8).
+-define(DFLAG_FUN_TAGS, 16#10).
+-define(DFLAG_NEW_FUN_TAGS, 16#80).
+-define(DFLAG_EXTENDED_PIDS_PORTS, 16#100).
+-define(DFLAG_EXPORT_PTR_TAG, 16#200).
+-define(DFLAG_BIT_BINARIES, 16#400).
+-define(DFLAG_NEW_FLOATS, 16#800).
+-define(DFLAG_UTF8_ATOMS, 16#10000).
+-define(DFLAG_MAP_TAG, 16#20000).
+-define(DFLAG_BIG_CREATION, 16#40000).
+-define(DFLAG_HANDSHAKE_23, 16#1000000).
+
+%% From OTP R9 extended references are compulsory.
+%% From OTP R10 extended pids and ports are compulsory.
+%% From OTP 20 UTF8 atoms are compulsory.
+%% From OTP 21 NEW_FUN_TAGS is compulsory (no more tuple fallback {fun, ...}).
+%% From OTP 23 BIG_CREATION is compulsory.
+%% From OTP 25 NEW_FLOATS, MAP_TAG, EXPORT_PTR_TAG, and BIT_BINARIES are compulsory.
+-define(COMPULSORY_DFLAGS,
+ (?DFLAG_EXTENDED_REFERENCES bor
+ ?DFLAG_FUN_TAGS bor
+ ?DFLAG_EXTENDED_PIDS_PORTS bor
+ ?DFLAG_UTF8_ATOMS bor
+ ?DFLAG_NEW_FUN_TAGS bor
+ ?DFLAG_BIG_CREATION bor
+ ?DFLAG_NEW_FLOATS bor
+ ?DFLAG_MAP_TAG bor
+ ?DFLAG_EXPORT_PTR_TAG bor
+ ?DFLAG_BIT_BINARIES)).
 
 -define(shutdown(X), exit(X)).
 -define(int16(X), [((X) bsr 8) band 16#ff, (X) band 16#ff]).
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
index 7ea5d52da7..6e58794b43 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
@@ -1283,14 +1283,9 @@ public abstract class AbstractConnection extends Thread {
 throw new IOException("Unknown remote node type");
 }
 
- if ((apeer.flags & AbstractNode.dFlagExtendedReferences) == 0) {
+ if ((apeer.flags & AbstractNode.mandatoryFlags) != AbstractNode.mandatoryFlags) {
 throw new IOException(
- "Handshake failed - peer cannot handle extended references");
- }
-
- if ((apeer.flags & AbstractNode.dFlagExtendedPidsPorts) == 0) {
- throw new IOException(
- "Handshake failed - peer cannot handle extended pids and ports");
+ "Handshake failed - peer cannot handle all mandatory capabilities");
 }
 
 } catch (final OtpErlangDecodeException e) {
@@ -1349,14 +1344,9 @@ public abstract class AbstractConnection extends Thread {
 "Handshake failed - peer has wrong name: " + hisname);
 }
 
- if ((peer.flags & AbstractNode.dFlagExtendedReferences) == 0) {
- throw new IOException(
- "Handshake failed - peer cannot handle extended references");
- }
-
- if ((peer.flags & AbstractNode.dFlagExtendedPidsPorts) == 0) {
+ if ((peer.flags & AbstractNode.mandatoryFlags) != AbstractNode.mandatoryFlags) {
 throw new IOException(
- "Handshake failed - peer cannot handle extended pids and ports");
+ "Handshake failed - peer cannot handle all mandatory capabilities");
 }
 
 } catch (final OtpErlangDecodeException e) {
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
index ce924e4d84..08bb63db73 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
@@ -97,19 +97,28 @@ public class AbstractNode implements OtpTransportFactory {
 static final int dFlagUnlinkId = 0x2000000;
 static final long dFlagV4PidsRefs = 0x4L << 32;
 
+ /* Mandatory flags for distribution. Keep them in sync with
+ DFLAG_DIST_MANDATORY in erts/emulator/beam/dist.h. */
+ static final long mandatoryFlags = dFlagExtendedReferences
+ | dFlagFunTags
+ | dFlagExtendedPidsPorts
+ | dFlagUtf8Atoms
+ | dflagNewFunTags
+ | dFlagBigCreation
+ | dFlagNewFloats
+ | dFlagMapTag
+ | dFlagExportPtrTag
+ | dFlagBitBinaries;
+
 int ntype = NTYPE_R6;
 int proto = 0; // tcp/ip
 int distHigh = 6;
 int distLow = 5; // Cannot talk to nodes before R6
 int creation = 0;
- long flags = dFlagExtendedReferences | dFlagExtendedPidsPorts
- | dFlagBitBinaries | dFlagNewFloats | dFlagFunTags
- | dflagNewFunTags | dFlagUtf8Atoms | dFlagMapTag
- | dFlagExportPtrTag
-	 | dFlagBigCreation
- | dFlagHandshake23
- | dFlagUnlinkId
- | dFlagV4PidsRefs;
+ long flags = mandatoryFlags
+ | dFlagHandshake23
+ | dFlagUnlinkId
+ | dFlagV4PidsRefs;
 
 /* initialize hostname and default cookie */
 static {
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 3f45860a7e..ae4794107e 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -41,29 +41,38 @@
 -define(DIST_VER_HIGH, 6).
 -define(DIST_VER_LOW, 5).
 
--define(DFLAG_PUBLISHED,1).
--define(DFLAG_ATOM_CACHE,2).
--define(DFLAG_EXTENDED_REFERENCES,4).
--define(DFLAG_DIST_MONITOR,8).
--define(DFLAG_FUN_TAGS,16#10).
--define(DFLAG_DIST_MONITOR_NAME,16#20).
--define(DFLAG_HIDDEN_ATOM_CACHE,16#40).
--define(DFLAG_NEW_FUN_TAGS,16#80).
--define(DFLAG_EXTENDED_PIDS_PORTS,16#100).
--define(DFLAG_UTF8_ATOMS, 16#10000).
--define(DFLAG_BIG_CREATION, 16#40000).
--define(DFLAG_HANDSHAKE_23, 16#01000000).
-
-%% From R9 and forward extended references is compulsory
-%% From R10 and forward extended pids and ports are compulsory
-%% From R20 and forward UTF8 atoms are compulsory
-%% From R21 and forward NEW_FUN_TAGS is compulsory (no more tuple fallback {fun, ...})
-%% From R23 and forward BIG_CREATION is compulsory
--define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor
- ?DFLAG_EXTENDED_PIDS_PORTS bor
- ?DFLAG_UTF8_ATOMS bor
- ?DFLAG_NEW_FUN_TAGS bor
- ?DFLAG_BIG_CREATION)).
+-define(DFLAG_PUBLISHED, 1).
+-define(DFLAG_ATOM_CACHE, 2).
+-define(DFLAG_EXTENDED_REFERENCES, 4).
+-define(DFLAG_DIST_MONITOR, 8).
+-define(DFLAG_FUN_TAGS, 16#10).
+-define(DFLAG_NEW_FUN_TAGS, 16#80).
+-define(DFLAG_EXTENDED_PIDS_PORTS, 16#100).
+-define(DFLAG_EXPORT_PTR_TAG, 16#200).
+-define(DFLAG_BIT_BINARIES, 16#400).
+-define(DFLAG_NEW_FLOATS, 16#800).
+-define(DFLAG_UTF8_ATOMS, 16#10000).
+-define(DFLAG_MAP_TAG, 16#20000).
+-define(DFLAG_BIG_CREATION, 16#40000).
+-define(DFLAG_HANDSHAKE_23, 16#1000000).
+
+%% From OTP R9 extended references are compulsory.
+%% From OTP R10 extended pids and ports are compulsory.
+%% From OTP 20 UTF8 atoms are compulsory.
+%% From OTP 21 NEW_FUN_TAGS is compulsory (no more tuple fallback {fun, ...}).
+%% From OTP 23 BIG_CREATION is compulsory.
+%% From OTP 25 NEW_FLOATS, MAP_TAG, EXPORT_PTR_TAG, and BIT_BINARIES are compulsory.
+-define(COMPULSORY_DFLAGS,
+ (?DFLAG_EXTENDED_REFERENCES bor
+ ?DFLAG_FUN_TAGS bor
+ ?DFLAG_EXTENDED_PIDS_PORTS bor
+ ?DFLAG_UTF8_ATOMS bor
+ ?DFLAG_NEW_FUN_TAGS bor
+ ?DFLAG_BIG_CREATION bor
+ ?DFLAG_NEW_FLOATS bor
+ ?DFLAG_MAP_TAG bor
+ ?DFLAG_EXPORT_PTR_TAG bor
+ ?DFLAG_BIT_BINARIES)).
 
 -define(PASS_THROUGH, $p).
 
-- 
2.26.2

Places

File 1291-Consolidate-mandatory-distribution-flags-across-appl.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Places