From 78ea501bcc84bd8bd49da97e514c1c3b20682d86 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 21 Mar 2019 22:32:05 +0100
Subject: erl_interface: Remove old encoding of pid,port,refs

with tiny creation.
---
 lib/erl_interface/src/encode/encode_pid.c  | 11 +++--------
 lib/erl_interface/src/encode/encode_port.c | 11 +++--------
 lib/erl_interface/src/encode/encode_ref.c  | 10 +++-------
 lib/erl_interface/test/erl_eterm_SUITE.erl | 10 ++++++++--
 4 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'lib/erl_interface')

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;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_port.c b/lib/erl_interface/src/encode/encode_port.c
index eb464380c0..0fb4018db1 100644
--- a/lib/erl_interface/src/encode/encode_port.c
+++ b/lib/erl_interface/src/encode/encode_port.c
@@ -25,7 +25,6 @@
 int ei_encode_port(char *buf, int *index, const erlang_port *p)
 {
   char *s = buf + *index;
-  const char tag = p->creation > 3 ? ERL_NEW_PORT_EXT : ERL_PORT_EXT;
 
   ++(*index); /* skip ERL_PORT_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node), ERLANG_UTF8,
@@ -33,19 +32,15 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p)
       return -1;
   }
   if (buf) {
-    put8(s, tag);
+    put8(s, ERL_NEW_PORT_EXT);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->id & 0x0fffffff /* 28 bits */);
-    if (tag == ERL_PORT_EXT) {
-        put8(s,(p->creation & 0x03));
-    } else {
-        put32be(s, p->creation);
-    }
+    put32be(s, p->creation);
   }
-  *index += 4 + (tag == ERL_PORT_EXT ? 1 : 4);
+  *index += 4 + 4;
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_ref.c b/lib/erl_interface/src/encode/encode_ref.c
index 5ccfc32c6d..8c2e0a25f7 100644
--- a/lib/erl_interface/src/encode/encode_ref.c
+++ b/lib/erl_interface/src/encode/encode_ref.c
@@ -24,7 +24,6 @@
 
 int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 {
-  const char tag = (p->creation > 3) ? ERL_NEWER_REFERENCE_EXT : ERL_NEW_REFERENCE_EXT;
   char *s = buf + *index;
   int i;
 
@@ -37,7 +36,7 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
   /* Always encode as an extended reference; all participating parties
      are now expected to be able to decode extended references. */
   if (buf) {
-	  put8(s, tag);
+	  put8(s, ERL_NEWER_REFERENCE_EXT);
 
 	  /* first, number of integers */
 	  put16be(s, p->len);
@@ -46,15 +45,12 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 	  s = buf + *index;
 
 	  /* now the integers */
-          if (tag == ERL_NEW_REFERENCE_EXT)
-              put8(s,(p->creation & 0x03));
-          else
-              put32be(s, p->creation);
+          put32be(s, p->creation);
 	  for (i = 0; i < p->len; i++)
 	      put32be(s,p->n[i]);
   }
   
-  *index += p->len*4 + (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4);
+  *index += p->len*4 + 4;
   return 0;
 }
 
diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl
index 77910a9fc7..4605293c74 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE.erl
+++ b/lib/erl_interface/test/erl_eterm_SUITE.erl
@@ -73,6 +73,10 @@
 
 -import(runner, [get_term/1]).
 
+-define(REFERENCE_EXT, $e).
+-define(NEW_REFERENCE_EXT, $r).
+-define(NEWER_REFERENCE_EXT, $Z).
+
 %% This test suite controls the running of the C language functions
 %% in eterm_test.c and print_term.c.
 
@@ -1026,9 +1030,11 @@ cnode_1(Config) when is_list(Config) ->
 
 check_ref(Ref) ->
     case bin_ext_type(Ref) of
-        101 ->
+        ?REFERENCE_EXT ->
             ct:fail(oldref);
-        114 ->
+        ?NEW_REFERENCE_EXT ->
+            ok;
+        ?NEWER_REFERENCE_EXT ->
             ok;
         Type ->
             ct:fail({type, Type})
-- 
cgit v1.2.3