From 83cd52cf585e37f65f956f18464b8cec98dde469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Fri, 9 Aug 2019 14:24:39 +0200
Subject: erts: Remove size check in bs_start_match

The size check is redundant now that all binaries are guaranteed
to be small enough that their size in bits fits into a word.
---
 erts/emulator/beam/bs_instrs.tab | 16 +---------------
 erts/emulator/beam/erl_bits.c    | 11 +++++------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/erts/emulator/beam/bs_instrs.tab b/erts/emulator/beam/bs_instrs.tab
index bd1ad91e45..4a878ac1db 100644
--- a/erts/emulator/beam/bs_instrs.tab
+++ b/erts/emulator/beam/bs_instrs.tab
@@ -876,9 +876,7 @@ bs_start_match.execute(Fail, Live, Slots, Dst) {
         result = erts_bs_start_match_2(c_p, context, slots);
         HTOP = HEAP_TOP(c_p);
         HEAP_SPACE_VERIFIED(0);
-        if (is_non_value(result)) {
-            $FAIL($Fail);
-        }
+
         $REFRESH_GEN_DEST();
         $Dst = result;
     } else {
@@ -1296,10 +1294,6 @@ i_bs_start_match3_gp.execute(Live, Fail, Dst, Pos) {
         HTOP = HEAP_TOP(c_p);
         HEAP_SPACE_VERIFIED(0);
 
-        if (ms == NULL) {
-            $FAIL($Fail);
-        }
-
         $REFRESH_GEN_DEST();
         $Dst = make_matchstate(ms);
         position = ms->mb.offset;
@@ -1348,10 +1342,6 @@ i_bs_start_match3.execute(Live, Fail, Dst) {
         HTOP = HEAP_TOP(c_p);
         HEAP_SPACE_VERIFIED(0);
 
-        if (ms == NULL) {
-            $FAIL($Fail);
-        }
-
         $REFRESH_GEN_DEST();
         $Dst = make_matchstate(ms);
     } else {
@@ -1523,10 +1513,6 @@ i_bs_start_match3.execute(Live, Fail, Dst) {
         HTOP = HEAP_TOP(c_p);
         HEAP_SPACE_VERIFIED(0);
 
-        if (is_non_value(result)) {
-            $FAIL($Fail);
-        }
-
         $REFRESH_GEN_DEST();
         $Dst = result;
     } else {
diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c
index f5807d25d7..df4d79651f 100644
--- a/erts/emulator/beam/erl_bits.c
+++ b/erts/emulator/beam/erl_bits.c
@@ -124,10 +124,10 @@ erts_bs_start_match_2(Process *p, Eterm Binary, Uint Max)
     ProcBin* pb;
 
     ASSERT(is_binary(Binary));
+
     total_bin_size = binary_size(Binary);
-    if ((total_bin_size >> (8*sizeof(Uint)-3)) != 0) {
-	return THE_NON_VALUE;
-    }
+    ASSERT(total_bin_size <= ERTS_UWORD_MAX / CHAR_BIT);
+
     NeededSize = ERL_BIN_MATCHSTATE_SIZE(Max);
     hp = HeapOnlyAlloc(p, NeededSize);
     ms = (ErlBinMatchState *) hp;
@@ -157,10 +157,9 @@ ErlBinMatchState *erts_bs_start_match_3(Process *p, Eterm Binary)
     ProcBin* pb;
 
     ASSERT(is_binary(Binary));
+
     total_bin_size = binary_size(Binary);
-    if ((total_bin_size >> (8*sizeof(Uint)-3)) != 0) {
-        return NULL;
-    }
+    ASSERT(total_bin_size <= ERTS_UWORD_MAX / CHAR_BIT);
 
     NeededSize = ERL_BIN_MATCHSTATE_SIZE(0);
     hp = HeapOnlyAlloc(p, NeededSize);
-- 
cgit v1.2.3