Shave off some more of the Unicode regex slowness.

p4raw-id: //depot/perl@17371

1 files changed, 5 insertions, 4 deletions

diff --git a/regexec.c b/regexec.c
index 0c45fd011f..f196cb7cfd 100644
--- a/regexec.c
+++ b/regexec.c
@@ -4284,15 +4284,16 @@ Perl_regclass_swash(pTHX_ register regnode* node, bool doinit, SV** listsvp, SV
 	if (PL_regdata->what[n] == 's') {
 	    SV *rv = (SV*)PL_regdata->data[n];
 	    AV *av = (AV*)SvRV((SV*)rv);
+	    SV **ary = AvARRAY(av);
 	    SV **a, **b;
 	
 	    /* See the end of regcomp.c:S_reglass() for
 	     * documentation of these array elements. */
 
-	    si  = *av_fetch(av, 0, FALSE);
-	    a   =  av_fetch(av, 1, FALSE);
-	    b   =  av_fetch(av, 2, FALSE);
-	
+	    si = *ary;
+	    a  = SvTYPE(ary[1]) == SVt_RV   ? &ary[1] : 0;
+	    b  = SvTYPE(ary[2]) == SVt_PVAV ? &ary[2] : 0;
+
 	    if (a)
 		sw = *a;
 	    else if (si && doinit) {