Manually revert "Rationalise RX_MATCH_UTF8_set()"

Commit 0254aed965 says in its message, among other things:

    Now that the RXf_MATCH_UTF8 flag on a regex is just used to indicate
    whether the captures on a successful match are utf8, only set
    this flag at the end of a successful match, rather than at the start of
    the match.

But if we only set the utf8 flag at the end of the match, then $^N
accessed within the match will have the flag wrongly set.

1 files changed, 2 insertions, 2 deletions

diff --git a/regexec.c b/regexec.c
index 37018ac048..e74ca18e4c 100644
--- a/regexec.c
+++ b/regexec.c
@@ -703,6 +703,7 @@ Perl_re_intuit_start(pTHX_
 	goto fail;
     }
 
+    RX_MATCH_UTF8_set(rx,utf8_target);
     reginfo->is_utf8_target = cBOOL(utf8_target);
     reginfo->info_aux = NULL;
     reginfo->strbeg = strbeg;
@@ -2617,6 +2618,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend,
     }
 
     RX_MATCH_TAINTED_off(rx);
+    RX_MATCH_UTF8_set(rx, utf8_target);
 
     reginfo->prog = rx;	 /* Yes, sorry that this is confusing.  */
     reginfo->intuit = 0;
@@ -3137,8 +3139,6 @@ got_it:
     if (RXp_PAREN_NAMES(prog)) 
         (void)hv_iterinit(RXp_PAREN_NAMES(prog));
 
-    RX_MATCH_UTF8_set(rx, utf8_target);
-
     /* make sure $`, $&, $', and $digit will work later */
     if ( !(flags & REXEC_NOT_FIRST) )
         S_reg_set_capture_string(aTHX_ rx,