Split ANYOF_NONBITMAP into two components

ANYOF_NONBITMAP means that the node can match things that aren't in its
bitmap.  Some things can match only when the target string is in utf8,
and some things can match even if it isn't.  If the target string is not
in utf8, and we know that the only possible match is when it is in utf8,
we know it can't match, and avoid a fruitless, expensive swash load.

This change also fixes a number of problems shown in t/re/grind_fold.t
that I will deliver soon.

1 files changed, 4 insertions, 2 deletions

diff --git a/regexec.c b/regexec.c
index b0e5777824..dcb83c2ca4 100644
--- a/regexec.c
+++ b/regexec.c
@@ -6299,11 +6299,13 @@ S_reginclass(pTHX_ const regexp * const prog, register const regnode * const n,
 
     /* If the bitmap didn't (or couldn't) match, and something outside the
      * bitmap could match, try that */
-    if (!match && (utf8_target || (flags & ANYOF_NONBITMAP))) {
+    if (!match) {
 	if (utf8_target && (flags & ANYOF_UNICODE_ALL) && c >= 256) {
 	    match = TRUE;
 	}
-	else {
+	else if ((flags & ANYOF_NONBITMAP_NON_UTF8)
+		 || (utf8_target && flags & ANYOF_UTF8))
+	{
 	    AV *av;
 	    SV * const sw = regclass_swash(prog, n, TRUE, 0, (SV**)&av);