This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Revert "inline.h: Silence compiler warning"
authorKarl Williamson <khw@cpan.org>
Wed, 4 Apr 2018 15:24:02 +0000 (09:24 -0600)
committerKarl Williamson <khw@cpan.org>
Wed, 4 Apr 2018 15:36:44 +0000 (09:36 -0600)
This reverts commit 0cb291171cc75e1aed1c415a7178c1ea9441259b which was
causing real failures.  Since I don't have access to this platform, I
think the way to go is to get the OP to work with me to come up with a
solution before committing to blead.  [perl #13307]

inline.h

index fc9e13e..8c20e75 100644 (file)
--- a/inline.h
+++ b/inline.h
@@ -641,8 +641,7 @@ S_variant_under_utf8_count(const U8* const s, const U8* const e)
         /* Process per-word as long as we have at least a full word left */
         do {    /* Commit 03c1e4ab1d6ee9062fb3f94b0ba31db6698724b1 contains an
                    explanation of how this works */
         /* Process per-word as long as we have at least a full word left */
         do {    /* Commit 03c1e4ab1d6ee9062fb3f94b0ba31db6698724b1 contains an
                    explanation of how this works */
-            count += (Size_t)
-                    ((((* (PERL_UINTMAX_T *) x) & PERL_VARIANTS_WORD_MASK) >> 7)
+            count += ((((* (PERL_UINTMAX_T *) x) & PERL_VARIANTS_WORD_MASK) >> 7)
                       * PERL_COUNT_MULTIPLIER)
                     >> ((PERL_WORDSIZE - 1) * CHARBITS);
             x += PERL_WORDSIZE;
                       * PERL_COUNT_MULTIPLIER)
                     >> ((PERL_WORDSIZE - 1) * CHARBITS);
             x += PERL_WORDSIZE;