Merge branch 'sverker/re-enable-big-creation/OTP-15603'

* sverker/re-enable-big-creation/OTP-15603:
  doc: Add links between dist flags and external tags (DTD updated)
  erts: Fix docs for new pid,port,ref external tags
  erts: Document new EPMD response ALIVE2_X_RESP
  erl_interface: Support 32-bit creation local cnode
  jinterface: Remove old encoding of pid,port,refs
  epmd: Support 32-bit creation values in local node
  erl_interface: Remove old encoding of pid,port,refs
  erts: Remove old encoding of pids, ports and refs
  erts: Make DFLAG_BIG_CREATION mandatory

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/erl_interface/src/encode/encode_pid.c b/lib/erl_interface/src/encode/encode_pid.c
index d14746b40f..0dfdb16372 100644
--- a/lib/erl_interface/src/encode/encode_pid.c
+++ b/lib/erl_interface/src/encode/encode_pid.c
@@ -25,7 +25,6 @@
 int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
 {
   char* s = buf + *index;
-  const char tag = (p->creation > 3) ? ERL_NEW_PID_EXT : ERL_PID_EXT;
 
   ++(*index); /* skip ERL_PID_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node),
@@ -33,21 +32,17 @@ int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
       return -1;
 
   if (buf) {
-    put8(s, tag);
+    put8(s, ERL_NEW_PID_EXT);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->num & 0x7fff); /* 15 bits */
     put32be(s,p->serial & 0x1fff); /* 13 bits */
-    if (tag == ERL_PID_EXT) {
-        put8(s,(p->creation & 0x03)); /* 2 bits */
-    } else {
-        put32be(s, p->creation); /* 32 bits */
-    }
+    put32be(s, p->creation); /* 32 bits */
   }
 
-  *index += 4 + 4 + (tag == ERL_PID_EXT ? 1 : 4);
+  *index += 4 + 4 + 4;
   return 0;
 }