Merge branch 'dev' into major

6 files changed, 81 insertions, 3 deletions

diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index b171e99e03..831c0b1ce6 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -87,6 +87,8 @@ bif erlang:exit/2
 bif 'erl.lang.proc':signal/2		ebif_signal_2 exit_2
 bif erlang:external_size/1
 bif 'erl.lang.term':external_size/1	ebif_external_size_1
+bif erlang:external_size/2
+bif 'erl.lang.term':external_size/2	ebif_external_size_2
 ubif erlang:float/1
 ubif 'erl.lang.number':to_float/1	ebif_to_float_1 float_1
 bif erlang:float_to_list/1
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index ea781a6cd0..f3db3f9326 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -578,7 +578,15 @@ int enif_is_identical(Eterm lhs, Eterm rhs)
 
 int enif_compare(Eterm lhs, Eterm rhs)
 {
-    return CMP(lhs,rhs);
+    Sint result = CMP(lhs,rhs);
+
+    if (result < 0) {
+        return -1;
+    } else if (result > 0) {
+        return 1;
+    }
+
+    return result;
 }
 
 int enif_get_tuple(ErlNifEnv* env, Eterm tpl, int* arity, const Eterm** array)
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 1a102f7187..6953e7fe7d 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -459,6 +459,12 @@ Uint erts_encode_ext_size(Eterm term)
 	+ 1 /* VERSION_MAGIC */;
 }
 
+Uint erts_encode_ext_size_2(Eterm term, unsigned dflags)
+{
+    return encode_size_struct2(NULL, term, TERM_TO_BINARY_DFLAGS|dflags)
+        + 1 /* VERSION_MAGIC */;
+}
+
 Uint erts_encode_ext_size_ets(Eterm term)
 {
     return encode_size_struct2(NULL, term, TERM_TO_BINARY_DFLAGS|DFLAGS_INTERNAL_TAGS);
@@ -1262,6 +1268,49 @@ external_size_1(Process* p, Eterm Term)
 }
 
 Eterm
+external_size_2(Process* p, Eterm Term, Eterm Flags)
+{
+    Uint size;
+    Uint flags = TERM_TO_BINARY_DFLAGS;
+
+    while (is_list(Flags)) {
+        Eterm arg = CAR(list_val(Flags));
+        Eterm* tp;
+
+        if (is_tuple(arg) && *(tp = tuple_val(arg)) == make_arityval(2)) {
+            if (tp[1] == am_minor_version && is_small(tp[2])) {
+                switch (signed_val(tp[2])) {
+                case 0:
+                    break;
+                case 1:
+                    flags |= DFLAG_NEW_FLOATS;
+                    break;
+                default:
+                    goto error;
+                }
+            } else {
+                goto error;
+            }
+        } else {
+        error:
+            BIF_ERROR(p, BADARG);
+        }
+        Flags = CDR(list_val(Flags));
+    }
+    if (is_not_nil(Flags)) {
+        goto error;
+    }
+
+    size = erts_encode_ext_size_2(Term, flags);
+    if (IS_USMALL(0, size)) {
+        BIF_RET(make_small(size));
+    } else {
+        Eterm* hp = HAlloc(p, BIG_UINT_HEAP_SIZE);
+        BIF_RET(uint_to_big(size, hp));
+    }
+}
+
+Eterm
 erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags)
 {
     Uint size;
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index d8287b96a4..72fe74baf2 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -160,6 +160,7 @@ Uint erts_encode_dist_ext_size(Eterm, Uint32, ErtsAtomCacheMap *);
 void erts_encode_dist_ext(Eterm, byte **, Uint32, ErtsAtomCacheMap *);
 
 Uint erts_encode_ext_size(Eterm);
+Uint erts_encode_ext_size_2(Eterm, unsigned);
 Uint erts_encode_ext_size_ets(Eterm);
 void erts_encode_ext(Eterm, byte **);
 byte* erts_encode_ext_ets(Eterm, byte *, struct erl_off_heap_header** ext_off_heap);
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 459dc84565..d9fc876482 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -441,6 +441,11 @@ terms(Config) when is_list(Config) ->
 			  Sz when is_integer(Sz), size(Bin) =< Sz ->
 			      ok
 		      end,
+              Bin1 = term_to_binary(Term, [{minor_version, 1}]),
+              case erlang:external_size(Bin1, [{minor_version, 1}]) of
+              Sz1 when is_integer(Sz1), size(Bin1) =< Sz1 ->
+                  ok
+              end,
 		      Term = binary_to_term(Bin),
 		      Term = binary_to_term(Bin, [safe]),
 		      Unaligned = make_unaligned_sub_binary(Bin),
@@ -473,7 +478,12 @@ terms_float(Config) when is_list(Config) ->
 			      Term = binary_to_term(Bin0),
 			      Bin1 = term_to_binary(Term, [{minor_version,1}]),
 			      Term = binary_to_term(Bin1),
-			      true = size(Bin1) < size(Bin0)
+			      true = size(Bin1) < size(Bin0),
+                  Size0 = erlang:external_size(Term),
+                  Size00 = erlang:external_size(Term, [{minor_version, 0}]),
+                  Size1 = erlang:external_size(Term, [{minor_version, 1}]),
+                  true = (Size0 =:= Size00),
+                  true = Size1 < Size0
 		      end).
 
 external_size(Config) when is_list(Config) ->
@@ -489,7 +499,9 @@ external_size(Config) when is_list(Config) ->
 	    io:format("  Aligned size: ~p\n", [Sz1]),
 	    io:format("Unaligned size: ~p\n", [Sz2]),
 	    ?line ?t:fail()
-    end.
+    end,
+    ?line erlang:external_size(Bin) =:= erlang:external_size(Bin, [{minor_version, 1}]),
+    ?line erlang:external_size(Unaligned) =:= erlang:external_size(Unaligned, [{minor_version, 1}]).
 
 external_size_1(Term, Size0, Limit) when Size0 < Limit ->
     case erlang:external_size(Term) of
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 9c31b7f78d..d95789fa6e 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -281,6 +281,12 @@ types(Config) when is_list(Config) ->
 		  end, int_list()),
 
     ?line verify_tmpmem(TmpMem),
+    ?line true = (compare(-1294536544000, -1178704800000) < 0),
+    ?line true = (compare(-1178704800000, -1294536544000) > 0),
+    ?line true = (compare(-295147905179352825856, -36893488147419103232) < 0),
+    ?line true = (compare(-36893488147419103232, -295147905179352825856) > 0),
+    ?line true = (compare(-29514790517935282585612345678, -36893488147419103232) < 0),
+    ?line true = (compare(-36893488147419103232, -29514790517935282585612345678) > 0),
     ok.
 
 int_list() ->