Fixed an issue affecting recursions in JIT
This commit is contained in:
parent
d4fa336fbc
commit
03654e751e
|
@ -95,6 +95,9 @@ fail.
|
||||||
23. Fixed a unicode properrty matching issue in JIT. The character was not
|
23. Fixed a unicode properrty matching issue in JIT. The character was not
|
||||||
fully read in caseless matching.
|
fully read in caseless matching.
|
||||||
|
|
||||||
|
24. Fixed an issue affecting recursions in JIT caused by duplicated data
|
||||||
|
transfers.
|
||||||
|
|
||||||
|
|
||||||
Version 10.39 29-October-2021
|
Version 10.39 29-October-2021
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
|
@ -413,6 +413,9 @@ typedef struct compiler_common {
|
||||||
/* Locals used by fast fail optimization. */
|
/* Locals used by fast fail optimization. */
|
||||||
sljit_s32 early_fail_start_ptr;
|
sljit_s32 early_fail_start_ptr;
|
||||||
sljit_s32 early_fail_end_ptr;
|
sljit_s32 early_fail_end_ptr;
|
||||||
|
/* Variables used by recursive call generator. */
|
||||||
|
sljit_s32 recurse_bitset_size;
|
||||||
|
uint8_t *recurse_bitset;
|
||||||
|
|
||||||
/* Flipped and lower case tables. */
|
/* Flipped and lower case tables. */
|
||||||
const sljit_u8 *fcc;
|
const sljit_u8 *fcc;
|
||||||
|
@ -2317,19 +2320,39 @@ for (i = 0; i < RECURSE_TMP_REG_COUNT; i++)
|
||||||
|
|
||||||
#undef RECURSE_TMP_REG_COUNT
|
#undef RECURSE_TMP_REG_COUNT
|
||||||
|
|
||||||
|
static BOOL recurse_check_bit(compiler_common *common, sljit_sw bit_index)
|
||||||
|
{
|
||||||
|
uint8_t *byte;
|
||||||
|
uint8_t mask;
|
||||||
|
|
||||||
|
SLJIT_ASSERT((bit_index & (sizeof(sljit_sw) - 1)) == 0);
|
||||||
|
|
||||||
|
bit_index >>= SLJIT_WORD_SHIFT;
|
||||||
|
|
||||||
|
mask = 1 << (bit_index & 0x7);
|
||||||
|
byte = common->recurse_bitset + (bit_index >> 3);
|
||||||
|
|
||||||
|
if (*byte & mask)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
*byte |= mask;
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
static int get_recurse_data_length(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend,
|
static int get_recurse_data_length(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend,
|
||||||
BOOL *needs_control_head, BOOL *has_quit, BOOL *has_accept)
|
BOOL *needs_control_head, BOOL *has_quit, BOOL *has_accept)
|
||||||
{
|
{
|
||||||
int length = 1;
|
int length = 1;
|
||||||
int size;
|
int size, offset;
|
||||||
PCRE2_SPTR alternative;
|
PCRE2_SPTR alternative;
|
||||||
BOOL quit_found = FALSE;
|
BOOL quit_found = FALSE;
|
||||||
BOOL accept_found = FALSE;
|
BOOL accept_found = FALSE;
|
||||||
BOOL setsom_found = FALSE;
|
BOOL setsom_found = FALSE;
|
||||||
BOOL setmark_found = FALSE;
|
BOOL setmark_found = FALSE;
|
||||||
BOOL capture_last_found = FALSE;
|
|
||||||
BOOL control_head_found = FALSE;
|
BOOL control_head_found = FALSE;
|
||||||
|
|
||||||
|
memset(common->recurse_bitset, 0, common->recurse_bitset_size);
|
||||||
|
|
||||||
#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
|
#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
|
||||||
SLJIT_ASSERT(common->control_head_ptr != 0);
|
SLJIT_ASSERT(common->control_head_ptr != 0);
|
||||||
control_head_found = TRUE;
|
control_head_found = TRUE;
|
||||||
|
@ -2352,14 +2375,16 @@ while (cc < ccend)
|
||||||
setsom_found = TRUE;
|
setsom_found = TRUE;
|
||||||
if (common->mark_ptr != 0)
|
if (common->mark_ptr != 0)
|
||||||
setmark_found = TRUE;
|
setmark_found = TRUE;
|
||||||
if (common->capture_last_ptr != 0)
|
if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
|
||||||
capture_last_found = TRUE;
|
length++;
|
||||||
cc += 1 + LINK_SIZE;
|
cc += 1 + LINK_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_KET:
|
case OP_KET:
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0)
|
||||||
{
|
{
|
||||||
|
if (recurse_check_bit(common, offset))
|
||||||
length++;
|
length++;
|
||||||
SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
|
SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
|
||||||
cc += PRIVATE_DATA(cc + 1);
|
cc += PRIVATE_DATA(cc + 1);
|
||||||
|
@ -2379,39 +2404,55 @@ while (cc < ccend)
|
||||||
case OP_SBRA:
|
case OP_SBRA:
|
||||||
case OP_SBRAPOS:
|
case OP_SBRAPOS:
|
||||||
case OP_SCOND:
|
case OP_SCOND:
|
||||||
length++;
|
|
||||||
SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
|
SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
|
||||||
|
if (recurse_check_bit(common, PRIVATE_DATA(cc)))
|
||||||
|
length++;
|
||||||
cc += 1 + LINK_SIZE;
|
cc += 1 + LINK_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_CBRA:
|
case OP_CBRA:
|
||||||
case OP_SCBRA:
|
case OP_SCBRA:
|
||||||
|
offset = GET2(cc, 1 + LINK_SIZE);
|
||||||
|
if (recurse_check_bit(common, OVECTOR(offset << 1)))
|
||||||
|
{
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, OVECTOR((offset << 1) + 1)));
|
||||||
length += 2;
|
length += 2;
|
||||||
if (common->capture_last_ptr != 0)
|
}
|
||||||
capture_last_found = TRUE;
|
if (common->optimized_cbracket[offset] == 0 && recurse_check_bit(common, OVECTOR_PRIV(offset)))
|
||||||
if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
|
length++;
|
||||||
|
if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
|
||||||
length++;
|
length++;
|
||||||
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_CBRAPOS:
|
case OP_CBRAPOS:
|
||||||
case OP_SCBRAPOS:
|
case OP_SCBRAPOS:
|
||||||
length += 2 + 2;
|
offset = GET2(cc, 1 + LINK_SIZE);
|
||||||
if (common->capture_last_ptr != 0)
|
if (recurse_check_bit(common, OVECTOR(offset << 1)))
|
||||||
capture_last_found = TRUE;
|
{
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, OVECTOR((offset << 1) + 1)));
|
||||||
|
length += 2;
|
||||||
|
}
|
||||||
|
if (recurse_check_bit(common, OVECTOR_PRIV(offset)))
|
||||||
|
length++;
|
||||||
|
if (recurse_check_bit(common, PRIVATE_DATA(cc)))
|
||||||
|
length++;
|
||||||
|
if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
|
||||||
|
length++;
|
||||||
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_COND:
|
case OP_COND:
|
||||||
/* Might be a hidden SCOND. */
|
/* Might be a hidden SCOND. */
|
||||||
alternative = cc + GET(cc, 1);
|
alternative = cc + GET(cc, 1);
|
||||||
if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
|
if ((*alternative == OP_KETRMAX || *alternative == OP_KETRMIN) && recurse_check_bit(common, PRIVATE_DATA(cc)))
|
||||||
length++;
|
length++;
|
||||||
cc += 1 + LINK_SIZE;
|
cc += 1 + LINK_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_PRIVATE_DATA_1
|
CASE_ITERATOR_PRIVATE_DATA_1
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
length++;
|
length++;
|
||||||
cc += 2;
|
cc += 2;
|
||||||
#ifdef SUPPORT_UNICODE
|
#ifdef SUPPORT_UNICODE
|
||||||
|
@ -2420,8 +2461,12 @@ while (cc < ccend)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_PRIVATE_DATA_2A
|
CASE_ITERATOR_PRIVATE_DATA_2A
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
|
{
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
|
||||||
length += 2;
|
length += 2;
|
||||||
|
}
|
||||||
cc += 2;
|
cc += 2;
|
||||||
#ifdef SUPPORT_UNICODE
|
#ifdef SUPPORT_UNICODE
|
||||||
if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
|
if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
|
||||||
|
@ -2429,8 +2474,12 @@ while (cc < ccend)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_PRIVATE_DATA_2B
|
CASE_ITERATOR_PRIVATE_DATA_2B
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
|
{
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
|
||||||
length += 2;
|
length += 2;
|
||||||
|
}
|
||||||
cc += 2 + IMM2_SIZE;
|
cc += 2 + IMM2_SIZE;
|
||||||
#ifdef SUPPORT_UNICODE
|
#ifdef SUPPORT_UNICODE
|
||||||
if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
|
if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
|
||||||
|
@ -2438,20 +2487,29 @@ while (cc < ccend)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_TYPE_PRIVATE_DATA_1
|
CASE_ITERATOR_TYPE_PRIVATE_DATA_1
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
length++;
|
length++;
|
||||||
cc += 1;
|
cc += 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
|
CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
|
{
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
|
||||||
length += 2;
|
length += 2;
|
||||||
|
}
|
||||||
cc += 1;
|
cc += 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
|
CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
|
{
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
|
||||||
length += 2;
|
length += 2;
|
||||||
|
}
|
||||||
cc += 1 + IMM2_SIZE;
|
cc += 1 + IMM2_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -2463,7 +2521,9 @@ while (cc < ccend)
|
||||||
#else
|
#else
|
||||||
size = 1 + 32 / (int)sizeof(PCRE2_UCHAR);
|
size = 1 + 32 / (int)sizeof(PCRE2_UCHAR);
|
||||||
#endif
|
#endif
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
|
||||||
|
offset = PRIVATE_DATA(cc);
|
||||||
|
if (offset != 0 && recurse_check_bit(common, offset))
|
||||||
length += get_class_iterator_size(cc + size);
|
length += get_class_iterator_size(cc + size);
|
||||||
cc += size;
|
cc += size;
|
||||||
break;
|
break;
|
||||||
|
@ -2498,7 +2558,6 @@ while (cc < ccend)
|
||||||
case OP_THEN:
|
case OP_THEN:
|
||||||
SLJIT_ASSERT(common->control_head_ptr != 0);
|
SLJIT_ASSERT(common->control_head_ptr != 0);
|
||||||
quit_found = TRUE;
|
quit_found = TRUE;
|
||||||
if (!control_head_found)
|
|
||||||
control_head_found = TRUE;
|
control_head_found = TRUE;
|
||||||
cc++;
|
cc++;
|
||||||
break;
|
break;
|
||||||
|
@ -2519,8 +2578,6 @@ SLJIT_ASSERT(cc == ccend);
|
||||||
|
|
||||||
if (control_head_found)
|
if (control_head_found)
|
||||||
length++;
|
length++;
|
||||||
if (capture_last_found)
|
|
||||||
length++;
|
|
||||||
if (quit_found)
|
if (quit_found)
|
||||||
{
|
{
|
||||||
if (setsom_found)
|
if (setsom_found)
|
||||||
|
@ -2553,14 +2610,12 @@ sljit_sw shared_srcw[3];
|
||||||
sljit_sw kept_shared_srcw[2];
|
sljit_sw kept_shared_srcw[2];
|
||||||
int private_count, shared_count, kept_shared_count;
|
int private_count, shared_count, kept_shared_count;
|
||||||
int from_sp, base_reg, offset, i;
|
int from_sp, base_reg, offset, i;
|
||||||
BOOL setsom_found = FALSE;
|
|
||||||
BOOL setmark_found = FALSE;
|
memset(common->recurse_bitset, 0, common->recurse_bitset_size);
|
||||||
BOOL capture_last_found = FALSE;
|
|
||||||
BOOL control_head_found = FALSE;
|
|
||||||
|
|
||||||
#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
|
#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
|
||||||
SLJIT_ASSERT(common->control_head_ptr != 0);
|
SLJIT_ASSERT(common->control_head_ptr != 0);
|
||||||
control_head_found = TRUE;
|
recurse_check_bit(common, common->control_head_ptr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch (type)
|
switch (type)
|
||||||
|
@ -2648,11 +2703,10 @@ while (cc < ccend)
|
||||||
{
|
{
|
||||||
case OP_SET_SOM:
|
case OP_SET_SOM:
|
||||||
SLJIT_ASSERT(common->has_set_som);
|
SLJIT_ASSERT(common->has_set_som);
|
||||||
if (has_quit && !setsom_found)
|
if (has_quit && recurse_check_bit(common, OVECTOR(0)))
|
||||||
{
|
{
|
||||||
kept_shared_srcw[0] = OVECTOR(0);
|
kept_shared_srcw[0] = OVECTOR(0);
|
||||||
kept_shared_count = 1;
|
kept_shared_count = 1;
|
||||||
setsom_found = TRUE;
|
|
||||||
}
|
}
|
||||||
cc += 1;
|
cc += 1;
|
||||||
break;
|
break;
|
||||||
|
@ -2660,33 +2714,31 @@ while (cc < ccend)
|
||||||
case OP_RECURSE:
|
case OP_RECURSE:
|
||||||
if (has_quit)
|
if (has_quit)
|
||||||
{
|
{
|
||||||
if (common->has_set_som && !setsom_found)
|
if (common->has_set_som && recurse_check_bit(common, OVECTOR(0)))
|
||||||
{
|
{
|
||||||
kept_shared_srcw[0] = OVECTOR(0);
|
kept_shared_srcw[0] = OVECTOR(0);
|
||||||
kept_shared_count = 1;
|
kept_shared_count = 1;
|
||||||
setsom_found = TRUE;
|
|
||||||
}
|
}
|
||||||
if (common->mark_ptr != 0 && !setmark_found)
|
if (common->mark_ptr != 0 && recurse_check_bit(common, common->mark_ptr))
|
||||||
{
|
{
|
||||||
kept_shared_srcw[kept_shared_count] = common->mark_ptr;
|
kept_shared_srcw[kept_shared_count] = common->mark_ptr;
|
||||||
kept_shared_count++;
|
kept_shared_count++;
|
||||||
setmark_found = TRUE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (common->capture_last_ptr != 0 && !capture_last_found)
|
if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
|
||||||
{
|
{
|
||||||
shared_srcw[0] = common->capture_last_ptr;
|
shared_srcw[0] = common->capture_last_ptr;
|
||||||
shared_count = 1;
|
shared_count = 1;
|
||||||
capture_last_found = TRUE;
|
|
||||||
}
|
}
|
||||||
cc += 1 + LINK_SIZE;
|
cc += 1 + LINK_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_KET:
|
case OP_KET:
|
||||||
if (PRIVATE_DATA(cc) != 0)
|
|
||||||
{
|
|
||||||
private_count = 1;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (private_srcw[0] != 0)
|
||||||
|
{
|
||||||
|
if (recurse_check_bit(common, private_srcw[0]))
|
||||||
|
private_count = 1;
|
||||||
SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
|
SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
|
||||||
cc += PRIVATE_DATA(cc + 1);
|
cc += PRIVATE_DATA(cc + 1);
|
||||||
}
|
}
|
||||||
|
@ -2705,50 +2757,66 @@ while (cc < ccend)
|
||||||
case OP_SBRA:
|
case OP_SBRA:
|
||||||
case OP_SBRAPOS:
|
case OP_SBRAPOS:
|
||||||
case OP_SCOND:
|
case OP_SCOND:
|
||||||
private_count = 1;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (recurse_check_bit(common, private_srcw[0]))
|
||||||
|
private_count = 1;
|
||||||
cc += 1 + LINK_SIZE;
|
cc += 1 + LINK_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_CBRA:
|
case OP_CBRA:
|
||||||
case OP_SCBRA:
|
case OP_SCBRA:
|
||||||
offset = (GET2(cc, 1 + LINK_SIZE)) << 1;
|
offset = GET2(cc, 1 + LINK_SIZE);
|
||||||
shared_srcw[0] = OVECTOR(offset);
|
shared_srcw[0] = OVECTOR(offset << 1);
|
||||||
shared_srcw[1] = OVECTOR(offset + 1);
|
if (recurse_check_bit(common, shared_srcw[0]))
|
||||||
|
{
|
||||||
|
shared_srcw[1] = shared_srcw[0] + sizeof(sljit_sw);
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, shared_srcw[1]));
|
||||||
shared_count = 2;
|
shared_count = 2;
|
||||||
|
|
||||||
if (common->capture_last_ptr != 0 && !capture_last_found)
|
|
||||||
{
|
|
||||||
shared_srcw[2] = common->capture_last_ptr;
|
|
||||||
shared_count = 3;
|
|
||||||
capture_last_found = TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
|
if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
|
||||||
{
|
{
|
||||||
|
shared_srcw[shared_count] = common->capture_last_ptr;
|
||||||
|
shared_count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (common->optimized_cbracket[offset] == 0)
|
||||||
|
{
|
||||||
|
private_srcw[0] = OVECTOR_PRIV(offset);
|
||||||
|
if (recurse_check_bit(common, private_srcw[0]))
|
||||||
private_count = 1;
|
private_count = 1;
|
||||||
private_srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_CBRAPOS:
|
case OP_CBRAPOS:
|
||||||
case OP_SCBRAPOS:
|
case OP_SCBRAPOS:
|
||||||
offset = (GET2(cc, 1 + LINK_SIZE)) << 1;
|
offset = GET2(cc, 1 + LINK_SIZE);
|
||||||
shared_srcw[0] = OVECTOR(offset);
|
shared_srcw[0] = OVECTOR(offset << 1);
|
||||||
shared_srcw[1] = OVECTOR(offset + 1);
|
if (recurse_check_bit(common, shared_srcw[0]))
|
||||||
shared_count = 2;
|
|
||||||
|
|
||||||
if (common->capture_last_ptr != 0 && !capture_last_found)
|
|
||||||
{
|
{
|
||||||
shared_srcw[2] = common->capture_last_ptr;
|
shared_srcw[1] = shared_srcw[0] + sizeof(sljit_sw);
|
||||||
shared_count = 3;
|
SLJIT_ASSERT(recurse_check_bit(common, shared_srcw[1]));
|
||||||
capture_last_found = TRUE;
|
shared_count = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
|
||||||
|
{
|
||||||
|
shared_srcw[shared_count] = common->capture_last_ptr;
|
||||||
|
shared_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
private_count = 2;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
private_srcw[1] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
|
if (recurse_check_bit(common, private_srcw[0]))
|
||||||
|
private_count = 1;
|
||||||
|
|
||||||
|
offset = OVECTOR_PRIV(offset);
|
||||||
|
if (recurse_check_bit(common, offset))
|
||||||
|
{
|
||||||
|
private_srcw[private_count] = offset;
|
||||||
|
private_count++;
|
||||||
|
}
|
||||||
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
cc += 1 + LINK_SIZE + IMM2_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -2757,18 +2825,17 @@ while (cc < ccend)
|
||||||
alternative = cc + GET(cc, 1);
|
alternative = cc + GET(cc, 1);
|
||||||
if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
|
if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
|
||||||
{
|
{
|
||||||
private_count = 1;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (recurse_check_bit(common, private_srcw[0]))
|
||||||
|
private_count = 1;
|
||||||
}
|
}
|
||||||
cc += 1 + LINK_SIZE;
|
cc += 1 + LINK_SIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_PRIVATE_DATA_1
|
CASE_ITERATOR_PRIVATE_DATA_1
|
||||||
if (PRIVATE_DATA(cc))
|
|
||||||
{
|
|
||||||
private_count = 1;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
}
|
if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
|
||||||
|
private_count = 1;
|
||||||
cc += 2;
|
cc += 2;
|
||||||
#ifdef SUPPORT_UNICODE
|
#ifdef SUPPORT_UNICODE
|
||||||
if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
|
if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
|
||||||
|
@ -2776,11 +2843,12 @@ while (cc < ccend)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_PRIVATE_DATA_2A
|
CASE_ITERATOR_PRIVATE_DATA_2A
|
||||||
if (PRIVATE_DATA(cc))
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
|
||||||
{
|
{
|
||||||
private_count = 2;
|
private_count = 2;
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
||||||
private_srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
|
SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
|
||||||
}
|
}
|
||||||
cc += 2;
|
cc += 2;
|
||||||
#ifdef SUPPORT_UNICODE
|
#ifdef SUPPORT_UNICODE
|
||||||
|
@ -2789,11 +2857,12 @@ while (cc < ccend)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_PRIVATE_DATA_2B
|
CASE_ITERATOR_PRIVATE_DATA_2B
|
||||||
if (PRIVATE_DATA(cc))
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
|
||||||
{
|
{
|
||||||
private_count = 2;
|
private_count = 2;
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
||||||
private_srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
|
SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
|
||||||
}
|
}
|
||||||
cc += 2 + IMM2_SIZE;
|
cc += 2 + IMM2_SIZE;
|
||||||
#ifdef SUPPORT_UNICODE
|
#ifdef SUPPORT_UNICODE
|
||||||
|
@ -2802,30 +2871,30 @@ while (cc < ccend)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_TYPE_PRIVATE_DATA_1
|
CASE_ITERATOR_TYPE_PRIVATE_DATA_1
|
||||||
if (PRIVATE_DATA(cc))
|
|
||||||
{
|
|
||||||
private_count = 1;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
}
|
if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
|
||||||
|
private_count = 1;
|
||||||
cc += 1;
|
cc += 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
|
CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
|
||||||
if (PRIVATE_DATA(cc))
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
|
||||||
{
|
{
|
||||||
private_count = 2;
|
private_count = 2;
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
|
||||||
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
|
||||||
}
|
}
|
||||||
cc += 1;
|
cc += 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
|
CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
|
||||||
if (PRIVATE_DATA(cc))
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
|
||||||
{
|
{
|
||||||
private_count = 2;
|
private_count = 2;
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
|
||||||
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
|
||||||
}
|
}
|
||||||
cc += 1 + IMM2_SIZE;
|
cc += 1 + IMM2_SIZE;
|
||||||
break;
|
break;
|
||||||
|
@ -2842,14 +2911,17 @@ while (cc < ccend)
|
||||||
switch(get_class_iterator_size(cc + i))
|
switch(get_class_iterator_size(cc + i))
|
||||||
{
|
{
|
||||||
case 1:
|
case 1:
|
||||||
private_count = 1;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
private_count = 2;
|
|
||||||
private_srcw[0] = PRIVATE_DATA(cc);
|
private_srcw[0] = PRIVATE_DATA(cc);
|
||||||
|
if (recurse_check_bit(common, private_srcw[0]))
|
||||||
|
{
|
||||||
|
private_count = 2;
|
||||||
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
|
||||||
|
SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -2864,28 +2936,25 @@ while (cc < ccend)
|
||||||
case OP_PRUNE_ARG:
|
case OP_PRUNE_ARG:
|
||||||
case OP_THEN_ARG:
|
case OP_THEN_ARG:
|
||||||
SLJIT_ASSERT(common->mark_ptr != 0);
|
SLJIT_ASSERT(common->mark_ptr != 0);
|
||||||
if (has_quit && !setmark_found)
|
if (has_quit && recurse_check_bit(common, common->mark_ptr))
|
||||||
{
|
{
|
||||||
kept_shared_srcw[0] = common->mark_ptr;
|
kept_shared_srcw[0] = common->mark_ptr;
|
||||||
kept_shared_count = 1;
|
kept_shared_count = 1;
|
||||||
setmark_found = TRUE;
|
|
||||||
}
|
}
|
||||||
if (common->control_head_ptr != 0 && !control_head_found)
|
if (common->control_head_ptr != 0 && recurse_check_bit(common, common->control_head_ptr))
|
||||||
{
|
{
|
||||||
private_srcw[0] = common->control_head_ptr;
|
private_srcw[0] = common->control_head_ptr;
|
||||||
private_count = 1;
|
private_count = 1;
|
||||||
control_head_found = TRUE;
|
|
||||||
}
|
}
|
||||||
cc += 1 + 2 + cc[1];
|
cc += 1 + 2 + cc[1];
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_THEN:
|
case OP_THEN:
|
||||||
SLJIT_ASSERT(common->control_head_ptr != 0);
|
SLJIT_ASSERT(common->control_head_ptr != 0);
|
||||||
if (!control_head_found)
|
if (recurse_check_bit(common, common->control_head_ptr))
|
||||||
{
|
{
|
||||||
private_srcw[0] = common->control_head_ptr;
|
private_srcw[0] = common->control_head_ptr;
|
||||||
private_count = 1;
|
private_count = 1;
|
||||||
control_head_found = TRUE;
|
|
||||||
}
|
}
|
||||||
cc++;
|
cc++;
|
||||||
break;
|
break;
|
||||||
|
@ -2893,7 +2962,7 @@ while (cc < ccend)
|
||||||
default:
|
default:
|
||||||
cc = next_opcode(common, cc);
|
cc = next_opcode(common, cc);
|
||||||
SLJIT_ASSERT(cc != NULL);
|
SLJIT_ASSERT(cc != NULL);
|
||||||
break;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type != recurse_copy_shared_to_global && type != recurse_copy_kept_shared_to_global)
|
if (type != recurse_copy_shared_to_global && type != recurse_copy_kept_shared_to_global)
|
||||||
|
@ -13811,7 +13880,7 @@ SLJIT_ASSERT(!(common->req_char_ptr != 0 && common->start_used_ptr != 0));
|
||||||
common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);
|
common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);
|
||||||
|
|
||||||
total_length = ccend - common->start;
|
total_length = ccend - common->start;
|
||||||
common->private_data_ptrs = (sljit_s32 *)SLJIT_MALLOC(total_length * (sizeof(sljit_s32) + (common->has_then ? 1 : 0)), allocator_data);
|
common->private_data_ptrs = (sljit_s32*)SLJIT_MALLOC(total_length * (sizeof(sljit_s32) + (common->has_then ? 1 : 0)), allocator_data);
|
||||||
if (!common->private_data_ptrs)
|
if (!common->private_data_ptrs)
|
||||||
{
|
{
|
||||||
SLJIT_FREE(common->optimized_cbracket, allocator_data);
|
SLJIT_FREE(common->optimized_cbracket, allocator_data);
|
||||||
|
@ -13852,6 +13921,7 @@ if (!compiler)
|
||||||
common->compiler = compiler;
|
common->compiler = compiler;
|
||||||
|
|
||||||
/* Main pcre2_jit_exec entry. */
|
/* Main pcre2_jit_exec entry. */
|
||||||
|
SLJIT_ASSERT((private_data_size & (sizeof(sljit_sw) - 1)) == 0);
|
||||||
sljit_emit_enter(compiler, 0, SLJIT_ARGS1(W, W), 5, 5, 0, 0, private_data_size);
|
sljit_emit_enter(compiler, 0, SLJIT_ARGS1(W, W), 5, 5, 0, 0, private_data_size);
|
||||||
|
|
||||||
/* Register init. */
|
/* Register init. */
|
||||||
|
@ -14074,20 +14144,40 @@ common->early_fail_end_ptr = 0;
|
||||||
common->currententry = common->entries;
|
common->currententry = common->entries;
|
||||||
common->local_quit_available = TRUE;
|
common->local_quit_available = TRUE;
|
||||||
quit_label = common->quit_label;
|
quit_label = common->quit_label;
|
||||||
while (common->currententry != NULL)
|
if (common->currententry != NULL)
|
||||||
|
{
|
||||||
|
/* A free bit for each private data. */
|
||||||
|
common->recurse_bitset_size = ((private_data_size / (int)sizeof(sljit_sw)) + 7) >> 3;
|
||||||
|
SLJIT_ASSERT(common->recurse_bitset_size > 0);
|
||||||
|
common->recurse_bitset = (sljit_u8*)SLJIT_MALLOC(common->recurse_bitset_size, allocator_data);;
|
||||||
|
|
||||||
|
if (common->recurse_bitset != NULL)
|
||||||
|
{
|
||||||
|
do
|
||||||
{
|
{
|
||||||
/* Might add new entries. */
|
/* Might add new entries. */
|
||||||
compile_recurse(common);
|
compile_recurse(common);
|
||||||
if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
|
if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
|
||||||
|
break;
|
||||||
|
flush_stubs(common);
|
||||||
|
common->currententry = common->currententry->next;
|
||||||
|
}
|
||||||
|
while (common->currententry != NULL);
|
||||||
|
|
||||||
|
SLJIT_FREE(common->recurse_bitset, allocator_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (common->currententry != NULL)
|
||||||
{
|
{
|
||||||
|
/* The common->recurse_bitset has been freed. */
|
||||||
|
SLJIT_ASSERT(sljit_get_compiler_error(compiler) || common->recurse_bitset == NULL);
|
||||||
|
|
||||||
sljit_free_compiler(compiler);
|
sljit_free_compiler(compiler);
|
||||||
SLJIT_FREE(common->optimized_cbracket, allocator_data);
|
SLJIT_FREE(common->optimized_cbracket, allocator_data);
|
||||||
SLJIT_FREE(common->private_data_ptrs, allocator_data);
|
SLJIT_FREE(common->private_data_ptrs, allocator_data);
|
||||||
PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
|
PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
|
||||||
return PCRE2_ERROR_NOMEMORY;
|
return PCRE2_ERROR_NOMEMORY;
|
||||||
}
|
}
|
||||||
flush_stubs(common);
|
|
||||||
common->currententry = common->currententry->next;
|
|
||||||
}
|
}
|
||||||
common->local_quit_available = FALSE;
|
common->local_quit_available = FALSE;
|
||||||
common->quit_label = quit_label;
|
common->quit_label = quit_label;
|
||||||
|
|
|
@ -751,6 +751,7 @@ static struct regression_test_case regression_test_cases[] = {
|
||||||
{ MU, A, 0, 0, "((?(R)a|(?1)){1,3}?)M", "aaaM" },
|
{ MU, A, 0, 0, "((?(R)a|(?1)){1,3}?)M", "aaaM" },
|
||||||
{ MU, A, 0, 0, "((.)(?:.|\\2(?1))){0}#(?1)#", "#aabbccdde# #aabbccddee#" },
|
{ MU, A, 0, 0, "((.)(?:.|\\2(?1))){0}#(?1)#", "#aabbccdde# #aabbccddee#" },
|
||||||
{ MU, A, 0, 0, "((.)(?:\\2|\\2{4}b)){0}#(?:(?1))+#", "#aaaab# #aaaaab#" },
|
{ MU, A, 0, 0, "((.)(?:\\2|\\2{4}b)){0}#(?:(?1))+#", "#aaaab# #aaaaab#" },
|
||||||
|
{ MU, A, 0, 0 | F_NOMATCH, "(?1)$((.|\\2xx){1,2})", "abc" },
|
||||||
|
|
||||||
/* 16 bit specific tests. */
|
/* 16 bit specific tests. */
|
||||||
{ CM, A, 0, 0 | F_FORCECONV, "\xc3\xa1", "\xc3\x81\xc3\xa1" },
|
{ CM, A, 0, 0 | F_FORCECONV, "\xc3\xa1", "\xc3\x81\xc3\xa1" },
|
||||||
|
|
Loading…
Reference in New Issue