Handle /[#]/ and /[(?#]/ with code blocks

This is a regression in 5.18.0.

In something like /[#](?{})/x, the perl toker incorrectly sees the '#' as a
comment and skips the code block without parsing it.

(cherry picked from commit c30fc27b4df65a43710b25dd1d2a57d78ee2fe33)

2 files changed, 15 insertions, 3 deletions

diff --git a/t/re/re_tests b/t/re/re_tests
index 7e7fc855f7..4d89e69e70 100644
--- a/t/re/re_tests
+++ b/t/re/re_tests
@@ -1737,3 +1737,15 @@ ab[c\\\](??{"x"})]{3}d	ab\\](d	y	-	-
 m?^xy\?$?	xy?	y	$&	xy?
 
 # vim: softtabstop=0 noexpandtab
+/[#]/	a#b	y	$&	#
+/[#]b/	a#b	y	$&	#b
+/[#]/x	a#b	y	$&	#
+/[#]b/x	a#b	y	$&	#b
+/[#](?{})/x	a#b	y	$&	#
+/[#](??{'b'})/x	a#b	y	$&	#b
+/(?#)(?{})b/	a#b	y	$&	b
+/(?#)(??{'b'})/	a#b	y	$&	b
+/[(?#](?{})b/	a#b	y	$&	#b
+/[(?#](??{'b'})/	a#b	y	$&	#b
+/(?#)(?{})b/x	a#b	y	$&	b
+/(?#)(??{'b'})/x	a#b	y	$&	b
diff --git a/toke.c b/toke.c
index d17a69cfb2..6c760076bb 100644
--- a/toke.c
+++ b/toke.c
@@ -3163,12 +3163,12 @@ S_scan_const(pTHX_ char *start)
 	 * char, which will be done separately.
 	 * Stop on (?{..}) and friends */
 
-	else if (*s == '(' && PL_lex_inpat && s[1] == '?') {
+	else if (*s == '(' && PL_lex_inpat && s[1] == '?' && !in_charclass) {
 	    if (s[2] == '#') {
 		while (s+1 < send && *s != ')')
 		    *d++ = NATIVE_TO_NEED(has_utf8,*s++);
 	    }
-	    else if (!PL_lex_casemods && !in_charclass &&
+	    else if (!PL_lex_casemods &&
 		     (    s[2] == '{' /* This should match regcomp.c */
 		      || (s[2] == '?' && s[3] == '{')))
 	    {
@@ -3177,7 +3177,7 @@ S_scan_const(pTHX_ char *start)
 	}
 
 	/* likewise skip #-initiated comments in //x patterns */
-	else if (*s == '#' && PL_lex_inpat &&
+	else if (*s == '#' && PL_lex_inpat && !in_charclass &&
 	  ((PMOP*)PL_lex_inpat)->op_pmflags & RXf_PMf_EXTENDED) {
 	    while (s+1 < send && *s != '\n')
 		*d++ = NATIVE_TO_NEED(has_utf8,*s++);