regexec.c: Remove folding now done in regcomp

1 files changed, 4 insertions, 11 deletions

diff --git a/regexec.c b/regexec.c
index 476a966caa..e0d27eaa4d 100644
--- a/regexec.c
+++ b/regexec.c
@@ -6638,18 +6638,11 @@ 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) {
-	if (utf8_target && (flags & ANYOF_UNICODE_ALL)) {
-	    if (c >= 256
-		|| ((flags & ANYOF_LOC_NONBITMAP_FOLD) /* Latin1 1 that has a
-							  non-Latin1 fold
-							  should match */
-		    && _HAS_NONLATIN1_FOLD_CLOSURE_ONLY_FOR_USE_BY_REGCOMP_DOT_C_AND_REGEXEC_DOT_C(c)))
-	    {
-		match = TRUE;
-	    }
+	if (utf8_target && (flags & ANYOF_UNICODE_ALL) && c >= 256) {
+	    match = TRUE;	/* Everything above 255 matches */
 	}
-	if (!match && ((flags & ANYOF_NONBITMAP_NON_UTF8)
-		       || (utf8_target && flags & ANYOF_UTF8)))
+	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);