We never have both separator and char limit.

So use an `else if` to save an extra check/branch. Gets 56 million instructions off the Perl 6 million lines/60 chars per line benchmark.
MoarVM · Jun 16, 2017 · 8972ab2 · 8972ab2
1 parent 8fa1857
commit 8972ab2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/strings/ascii.c b/src/strings/ascii.c
@@ -102,11 +102,11 @@ MVMuint32 MVM_string_ascii_decodestream(MVMThreadContext *tc, MVMDecodeStream *d
             last_accept_bytes = cur_bytes;
             last_accept_pos = pos;
             total++;
-            if (stopper_chars && *stopper_chars == total) {
+            if (MVM_string_decode_stream_maybe_sep(tc, seps, codepoint)) {
                 reached_stopper = 1;
                 goto done;
             }
-            if (MVM_string_decode_stream_maybe_sep(tc, seps, codepoint)) {
+            else if (stopper_chars && *stopper_chars == total) {
                 reached_stopper = 1;
                 goto done;
             }

diff --git a/src/strings/latin1.c b/src/strings/latin1.c
@@ -111,11 +111,11 @@ MVMuint32 MVM_string_latin1_decodestream(MVMThreadContext *tc, MVMDecodeStream *
             last_accept_bytes = cur_bytes;
             last_accept_pos = pos;
             total++;
-            if (stopper_chars && *stopper_chars == total) {
+            if (MVM_string_decode_stream_maybe_sep(tc, seps, codepoint)) {
                 reached_stopper = 1;
                 goto done;
             }
-            if (MVM_string_decode_stream_maybe_sep(tc, seps, codepoint)) {
+            else if (stopper_chars && *stopper_chars == total) {
                 reached_stopper = 1;
                 goto done;
             }

diff --git a/src/strings/utf8.c b/src/strings/utf8.c
@@ -386,11 +386,11 @@ MVMuint32 MVM_string_utf8_decodestream(MVMThreadContext *tc, MVMDecodeStream *ds
                     }
                     buffer[count++] = g;
                     total++;
-                    if (stopper_chars && *stopper_chars == total) {
+                    if (MVM_string_decode_stream_maybe_sep(tc, seps, g)) {
                         reached_stopper = 1;
                         goto done;
                     }
-                    if (MVM_string_decode_stream_maybe_sep(tc, seps, g)) {
+                    else if (stopper_chars && *stopper_chars == total) {
                         reached_stopper = 1;
                         goto done;
                     }

diff --git a/src/strings/windows1252.c b/src/strings/windows1252.c
@@ -194,11 +194,11 @@ MVMuint32 MVM_string_windows1252_decodestream(MVMThreadContext *tc, MVMDecodeStr
             last_accept_bytes = cur_bytes;
             last_accept_pos = pos;
             total++;
-            if (stopper_chars && *stopper_chars == total) {
+            if (MVM_string_decode_stream_maybe_sep(tc, seps, codepoint)) {
                 reached_stopper = 1;
                 goto done;
             }
-            if (MVM_string_decode_stream_maybe_sep(tc, seps, codepoint)) {
+            else if (stopper_chars && *stopper_chars == total) {
                 reached_stopper = 1;
                 goto done;
             }