Revert "regcomp.c: Move 2 hdr inversion fields to SV hdr"

This reverts commit 4fdeca7844470c929f35857f49078db1fd124dbc.
This continues the backing out of this topic branch.  A bisect shows
that the first commit exhibiting an error is the first one in the
branch.

1 files changed, 102 insertions, 34 deletions

diff --git a/charclass_invlists.h b/charclass_invlists.h
index 88ebe67640..690526dd6e 100644
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -11,7 +11,9 @@
 
 static UV Latin1_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -24,7 +26,9 @@ static UV Latin1_invlist[] = {
 
 static UV AboveLatin1_invlist[] = {
 	1,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -37,7 +41,9 @@ static UV AboveLatin1_invlist[] = {
 
 static UV ASCII_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -50,7 +56,9 @@ static UV ASCII_invlist[] = {
 
 static UV L1Cased_invlist[] = {
 	16,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -78,7 +86,9 @@ static UV L1Cased_invlist[] = {
 
 static UV VertSpace_invlist[] = {
 	6,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -96,7 +106,9 @@ static UV VertSpace_invlist[] = {
 
 static UV PerlSpace_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -112,7 +124,9 @@ static UV PerlSpace_invlist[] = {
 
 static UV XPerlSpace_invlist[] = {
 	22,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -146,7 +160,9 @@ static UV XPerlSpace_invlist[] = {
 
 static UV PosixAlnum_invlist[] = {
 	6,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -164,7 +180,9 @@ static UV PosixAlnum_invlist[] = {
 
 static UV L1PosixAlnum_invlist[] = {
 	18,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -194,7 +212,9 @@ static UV L1PosixAlnum_invlist[] = {
 
 static UV PosixAlpha_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -210,7 +230,9 @@ static UV PosixAlpha_invlist[] = {
 
 static UV L1PosixAlpha_invlist[] = {
 	16,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -238,7 +260,9 @@ static UV L1PosixAlpha_invlist[] = {
 
 static UV PosixBlank_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -254,7 +278,9 @@ static UV PosixBlank_invlist[] = {
 
 static UV XPosixBlank_invlist[] = {
 	18,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -284,7 +310,9 @@ static UV XPosixBlank_invlist[] = {
 
 static UV PosixCntrl_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -299,7 +327,9 @@ static UV PosixCntrl_invlist[] = {
 
 static UV XPosixCntrl_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -314,7 +344,9 @@ static UV XPosixCntrl_invlist[] = {
 
 static UV PosixDigit_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -328,7 +360,9 @@ static UV PosixDigit_invlist[] = {
 
 static UV PosixGraph_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -342,7 +376,9 @@ static UV PosixGraph_invlist[] = {
 
 static UV L1PosixGraph_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -358,7 +394,9 @@ static UV L1PosixGraph_invlist[] = {
 
 static UV PosixLower_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -372,7 +410,9 @@ static UV PosixLower_invlist[] = {
 
 static UV L1PosixLower_invlist[] = {
 	12,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -396,7 +436,9 @@ static UV L1PosixLower_invlist[] = {
 
 static UV PosixPrint_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -410,7 +452,9 @@ static UV PosixPrint_invlist[] = {
 
 static UV L1PosixPrint_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -426,7 +470,9 @@ static UV L1PosixPrint_invlist[] = {
 
 static UV PosixPunct_invlist[] = {
 	8,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -446,7 +492,9 @@ static UV PosixPunct_invlist[] = {
 
 static UV L1PosixPunct_invlist[] = {
 	20,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -478,7 +526,9 @@ static UV L1PosixPunct_invlist[] = {
 
 static UV PosixSpace_invlist[] = {
 	4,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -494,7 +544,9 @@ static UV PosixSpace_invlist[] = {
 
 static UV XPosixSpace_invlist[] = {
 	22,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -528,7 +580,9 @@ static UV XPosixSpace_invlist[] = {
 
 static UV PosixUpper_invlist[] = {
 	2,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -542,7 +596,9 @@ static UV PosixUpper_invlist[] = {
 
 static UV L1PosixUpper_invlist[] = {
 	6,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -560,7 +616,9 @@ static UV L1PosixUpper_invlist[] = {
 
 static UV PosixWord_invlist[] = {
 	8,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -580,7 +638,9 @@ static UV PosixWord_invlist[] = {
 
 static UV L1PosixWord_invlist[] = {
 	20,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -612,7 +672,9 @@ static UV L1PosixWord_invlist[] = {
 
 static UV PosixXDigit_invlist[] = {
 	6,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -630,7 +692,9 @@ static UV PosixXDigit_invlist[] = {
 
 static UV XPosixXDigit_invlist[] = {
 	12,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -652,7 +716,9 @@ static UV XPosixXDigit_invlist[] = {
 
 static UV NonL1_Perl_Non_Final_Folds_invlist[] = {
 	44,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -706,7 +772,9 @@ static UV NonL1_Perl_Non_Final_Folds_invlist[] = {
 
 static UV _Perl_Multi_Char_Folds_invlist[] = {
 	58,	/* Number of elements */
-	1511554547, /* Version and data structure type */
+	0,	/* Current iteration position */
+	0,	/* Cache of previous search index result */
+	1039476070, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,