erts: Remove enif_phash2_ranged

7 files changed, 15 insertions, 69 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index d59adc18d6..214de3652f 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -4888,6 +4888,7 @@ BIF_RETTYPE phash2_1(BIF_ALIST_1)
 BIF_RETTYPE phash2_2(BIF_ALIST_2)
 {
     Uint32 hash;
+    Uint32 final_hash;
     Uint32 range;
 
     /* Check for special case 2^32 */
@@ -4900,19 +4901,23 @@ BIF_RETTYPE phash2_2(BIF_ALIST_2)
 	}
 	range = (Uint32) u;
     }
-    hash = make_hash2_within_range(BIF_ARG_1, range);
-
+    hash = make_hash2(BIF_ARG_1);
+    if (range) {
+	final_hash = hash % range; /* [0..range-1] */
+    } else {
+	final_hash = hash;
+    }
     /*
      * Return either a small or a big. Use the heap for bigs if there is room.
      */
 #if defined(ARCH_64)
-    BIF_RET(make_small(hash));
+    BIF_RET(make_small(final_hash));
 #else
-    if (IS_USMALL(0, hash)) {
-	BIF_RET(make_small(hash));
+    if (IS_USMALL(0, final_hash)) {
+	BIF_RET(make_small(final_hash));
     } else {
 	Eterm* hp = HAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
-	BIF_RET(uint_to_big(hash, hp));
+	BIF_RET(uint_to_big(final_hash, hp));
     }
 #endif
 }
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 14abf461a3..f7777c8b92 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1214,25 +1214,15 @@ int enif_compare(Eterm lhs, Eterm rhs)
     return result;
 }
 
+unsigned long enif_phash2(Eterm term)
+{
 #if SIZEOF_LONG < 4
 /* This *really* shouldn't happen */
 #  error Incompatible long word size
 #endif
-
-unsigned long enif_phash2(Eterm term)
-{
     return make_hash2(term) & ((1 << 27) - 1);
 }
 
-unsigned long enif_phash2_ranged(Eterm term, unsigned long range)
-{
-#if SIZEOF_LONG > 4
-    if (range > (unsigned long) UINT32_MAX)
-        range = 0;
-#endif
-    return make_hash2_within_range(term, range);
-}
-
 int enif_get_tuple(ErlNifEnv* env, Eterm tpl, int* arity, const Eterm** array)
 {
     Eterm* ptr;
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index 8a3f9165d9..c096b18f91 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -48,7 +48,6 @@ ERL_NIF_API_FUNC_DECL(int,enif_get_tuple,(ErlNifEnv* env, ERL_NIF_TERM tpl, int*
 ERL_NIF_API_FUNC_DECL(int,enif_is_identical,(ERL_NIF_TERM lhs, ERL_NIF_TERM rhs));
 ERL_NIF_API_FUNC_DECL(int,enif_compare,(ERL_NIF_TERM lhs, ERL_NIF_TERM rhs));
 ERL_NIF_API_FUNC_DECL(unsigned long,enif_phash2,(ERL_NIF_TERM term));
-ERL_NIF_API_FUNC_DECL(unsigned long,enif_phash2_ranged,(ERL_NIF_TERM term, unsigned long));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_binary,(ErlNifEnv* env, ErlNifBinary* bin));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_badarg,(ErlNifEnv* env));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_int,(ErlNifEnv* env, int i));
@@ -211,7 +210,6 @@ ERL_NIF_API_FUNC_DECL(int, enif_compare_monitors,(const ErlNifMonitor*,const Erl
 #  define enif_is_identical ERL_NIF_API_FUNC_MACRO(enif_is_identical)
 #  define enif_compare ERL_NIF_API_FUNC_MACRO(enif_compare)
 #  define enif_phash2 ERL_NIF_API_FUNC_MACRO(enif_phash2)
-#  define enif_phash2_ranged ERL_NIF_API_FUNC_MACRO(enif_phash2_ranged)
 
 #  define enif_make_binary ERL_NIF_API_FUNC_MACRO(enif_make_binary)
 #  define enif_make_badarg ERL_NIF_API_FUNC_MACRO(enif_make_badarg)
diff --git a/erts/emulator/beam/erl_utils.h b/erts/emulator/beam/erl_utils.h
index 75578c26d6..47289a0af1 100644
--- a/erts/emulator/beam/erl_utils.h
+++ b/erts/emulator/beam/erl_utils.h
@@ -119,7 +119,6 @@ Sint erts_list_length(Eterm);
 int erts_is_builtin(Eterm, Eterm, int);
 Uint32 block_hash(byte *, unsigned, Uint32);
 Uint32 make_hash2(Eterm);
-Uint32 make_hash2_within_range(Eterm, Uint32);
 Uint32 make_hash(Eterm);
 Uint32 make_internal_hash(Eterm);
 
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 72c59b33c6..8f3f48f38f 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -1552,16 +1552,6 @@ make_hash2(Eterm term)
     }
 }
 
-Uint32
-make_hash2_within_range(Eterm term, Uint32 range)
-{
-    Uint32 hash = make_hash2(term);
-    if (range)
-        return hash % range; /* [0..range-1] */
-    else
-        return hash; /* Special case: 2**32 */
-}
-
 /* Term hash function for internal use.
  *
  * Limitation #1: Is not "portable" in any way between different VM instances.
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 780fe0a5ee..f868b018c9 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -57,8 +57,7 @@
          nif_term_to_binary/1, nif_binary_to_term/1,
          nif_port_command/1,
          nif_snprintf/1,
-         nif_phash2/1,
-         nif_phash2_ranged/1
+         nif_phash2/1
 	]).
 
 -export([many_args_100/100]).
@@ -93,8 +92,7 @@ all() ->
      nif_term_to_binary, nif_binary_to_term,
      nif_port_command,
      nif_snprintf,
-     nif_phash2,
-     nif_phash2_ranged].
+     nif_phash2].
 
 groups() ->
     [{G, [], api_repeaters()} || G <- api_groups()]
@@ -2629,29 +2627,6 @@ nif_phash2(Config) ->
       end,
       Terms).
 
-nif_phash2_ranged(Config) ->
-    ensure_lib_loaded(Config),
-    RandomRangedTerms =
-        [{random_term(), rand:uniform((1 bsl 32) - 1)}
-         || _ <- lists:seq(1, 1000)],
-
-    lists:foreach(
-      fun ({Term, Range}) ->
-              HashValue = erlang:phash2(Term, Range),
-              NifHashValue = phash2_ranged_nif(Term, Range),
-              (HashValue =:= NifHashValue
-               orelse ct:fail("Expected: ~p\nActual:   ~p",
-                              [HashValue, NifHashValue]))
-      end,
-      RandomRangedTerms),
-
-    EdgeCaseTerm = random_term(),
-    EdgeCaseHashValue = erlang:phash2(EdgeCaseTerm, 1 bsl 32),
-    EdgeCaseNifHashValue = phash2_ranged_nif(EdgeCaseTerm, 0),
-    (EdgeCaseHashValue =:= EdgeCaseNifHashValue
-     orelse ct:fail("Expected: ~p\nActual:   ~p",
-                    [EdgeCaseHashValue, EdgeCaseNifHashValue])).
-
 -define(HALF_DBL_EPSILON, 1.1102230246251565e-16). % math:pow(2, -53)
 
 random_term() ->
@@ -2701,7 +2676,6 @@ tuple_2_list(_) -> ?nif_stub.
 is_identical(_,_) -> ?nif_stub.
 compare(_,_) -> ?nif_stub.
 phash2_nif(_) -> ?nif_stub.
-phash2_ranged_nif(_, _) -> ?nif_stub.
 many_args_100(_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_) -> ?nif_stub.
 clone_bin(_) -> ?nif_stub.
 make_sub_bin(_,_,_) -> ?nif_stub.
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 3bdd4d93c7..dac6d02e9d 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -695,15 +695,6 @@ static ERL_NIF_TERM phash2_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     return enif_make_ulong(env, enif_phash2(argv[0]));
 }
 
-static ERL_NIF_TERM phash2_ranged_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    unsigned long range;
-    if (argc != 2 || !enif_get_ulong(env, argv[1], &range)) {
-        return enif_make_badarg(env);
-    }
-    return enif_make_ulong(env, enif_phash2_ranged(argv[0], range));
-}
-
 static ERL_NIF_TERM many_args_100(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     int i, k;
@@ -2882,7 +2873,6 @@ static ErlNifFunc nif_funcs[] =
     {"is_identical",2,is_identical},
     {"compare",2,compare},
     {"phash2_nif",1,phash2_nif},
-    {"phash2_ranged_nif",2,phash2_ranged_nif},
     {"many_args_100", 100, many_args_100},
     {"clone_bin", 1, clone_bin},
     {"make_sub_bin", 3, make_sub_bin},