Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/RegExpInlines.h (248227 => 248228)
--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/RegExpInlines.h 2019-08-04 03:22:58 UTC (rev 248227)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/RegExpInlines.h 2019-08-04 03:23:02 UTC (rev 248228)
@@ -85,38 +85,38 @@
return false;
}
-#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
class PatternContextBufferHolder {
+ WTF_FORBID_HEAP_ALLOCATION;
public:
PatternContextBufferHolder(VM& vm, bool needBuffer)
: m_vm(vm)
- , m_needBuffer(needBuffer)
{
- if (m_needBuffer) {
+#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
+ if (needBuffer)
m_buffer = m_vm.acquireRegExpPatternContexBuffer();
- m_size = VM::patternContextBufferSize;
- } else {
- m_buffer = nullptr;
- m_size = 0;
- }
+#else
+ UNUSED_PARAM(needBuffer);
+#endif
+
}
~PatternContextBufferHolder()
{
- if (m_needBuffer)
+#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
+ if (buffer())
m_vm.releaseRegExpPatternContexBuffer();
+#else
+ UNUSED_PARAM(m_vm);
+#endif
}
void* buffer() { return m_buffer; }
- unsigned size() { return m_size; }
+ unsigned size() { return buffer() ? VM::patternContextBufferSize : 0; }
private:
VM& m_vm;
- bool m_needBuffer;
- void* m_buffer;
- unsigned m_size;
+ void* m_buffer { nullptr };
};
-#endif
ALWAYS_INLINE void RegExp::compileIfNecessary(VM& vm, Yarr::YarrCharSize charSize)
{
@@ -159,20 +159,12 @@
#if ENABLE(YARR_JIT)
if (m_state == JITCode) {
{
-#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
PatternContextBufferHolder patternContextBufferHolder(vm, m_regExpJITCode.usesPatternContextBuffer());
-#define EXTRA_JIT_PARAMS , patternContextBufferHolder.buffer(), patternContextBufferHolder.size()
-#else
-#define EXTRA_JIT_PARAMS
-#endif
-
if (s.is8Bit())
- result = m_regExpJITCode.execute(s.characters8(), startOffset, s.length(), offsetVector EXTRA_JIT_PARAMS).start;
+ result = m_regExpJITCode.execute(s.characters8(), startOffset, s.length(), offsetVector, patternContextBufferHolder.buffer(), patternContextBufferHolder.size()).start;
else
- result = m_regExpJITCode.execute(s.characters16(), startOffset, s.length(), offsetVector EXTRA_JIT_PARAMS).start;
-
-#undef EXTRA_JIT_PARAMS
+ result = m_regExpJITCode.execute(s.characters16(), startOffset, s.length(), offsetVector, patternContextBufferHolder.buffer(), patternContextBufferHolder.size()).start;
}
if (result == Yarr::JSRegExpJITCodeFailure) {
@@ -285,20 +277,11 @@
if (m_state == JITCode) {
{
-#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
PatternContextBufferHolder patternContextBufferHolder(vm, m_regExpJITCode.usesPatternContextBuffer());
-
-#define EXTRA_JIT_PARAMS , patternContextBufferHolder.buffer(), patternContextBufferHolder.size()
-#else
-#define EXTRA_JIT_PARAMS
-#endif
-
if (s.is8Bit())
- result = m_regExpJITCode.execute(s.characters8(), startOffset, s.length() EXTRA_JIT_PARAMS);
+ result = m_regExpJITCode.execute(s.characters8(), startOffset, s.length(), patternContextBufferHolder.buffer(), patternContextBufferHolder.size());
else
- result = m_regExpJITCode.execute(s.characters16(), startOffset, s.length() EXTRA_JIT_PARAMS);
-
-#undef EXTRA_JIT_PARAMS
+ result = m_regExpJITCode.execute(s.characters16(), startOffset, s.length(), patternContextBufferHolder.buffer(), patternContextBufferHolder.size());
}
#if ENABLE(REGEXP_TRACING)
Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/yarr/YarrJIT.h (248227 => 248228)
--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/yarr/YarrJIT.h 2019-08-04 03:22:58 UTC (rev 248227)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/yarr/YarrJIT.h 2019-08-04 03:23:02 UTC (rev 248228)
@@ -38,10 +38,6 @@
#define YARR_CALL
#endif
-#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
-constexpr size_t patternContextBufferSize = 8192; // Space caller allocates to save nested parenthesis context
-#endif
-
namespace JSC {
class VM;
@@ -61,24 +57,11 @@
};
class YarrCodeBlock {
-#if CPU(X86_64) || CPU(ARM64)
-#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
- typedef MatchResult (*YarrJITCode8)(const LChar* input, unsigned start, unsigned length, int* output, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
- typedef MatchResult (*YarrJITCode16)(const UChar* input, unsigned start, unsigned length, int* output, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
- typedef MatchResult (*YarrJITCodeMatchOnly8)(const LChar* input, unsigned start, unsigned length, void*, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
- typedef MatchResult (*YarrJITCodeMatchOnly16)(const UChar* input, unsigned start, unsigned length, void*, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
-#else
- typedef MatchResult (*YarrJITCode8)(const LChar* input, unsigned start, unsigned length, int* output) YARR_CALL;
- typedef MatchResult (*YarrJITCode16)(const UChar* input, unsigned start, unsigned length, int* output) YARR_CALL;
- typedef MatchResult (*YarrJITCodeMatchOnly8)(const LChar* input, unsigned start, unsigned length) YARR_CALL;
- typedef MatchResult (*YarrJITCodeMatchOnly16)(const UChar* input, unsigned start, unsigned length) YARR_CALL;
-#endif
-#else
- typedef EncodedMatchResult (*YarrJITCode8)(const LChar* input, unsigned start, unsigned length, int* output) YARR_CALL;
- typedef EncodedMatchResult (*YarrJITCode16)(const UChar* input, unsigned start, unsigned length, int* output) YARR_CALL;
- typedef EncodedMatchResult (*YarrJITCodeMatchOnly8)(const LChar* input, unsigned start, unsigned length) YARR_CALL;
- typedef EncodedMatchResult (*YarrJITCodeMatchOnly16)(const UChar* input, unsigned start, unsigned length) YARR_CALL;
-#endif
+ // Technically freeParenContext and parenContextSize are only used if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS) is set. Fortunately, all the calling conventions we support have caller save argument registers.
+ using YarrJITCode8 = EncodedMatchResult (*)(const LChar* input, unsigned start, unsigned length, int* output, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
+ using YarrJITCode16 = EncodedMatchResult (*)(const UChar* input, unsigned start, unsigned length, int* output, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
+ using YarrJITCodeMatchOnly8 = EncodedMatchResult (*)(const LChar* input, unsigned start, unsigned length, void*, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
+ using YarrJITCodeMatchOnly16 = EncodedMatchResult (*)(const UChar* input, unsigned start, unsigned length, void*, void* freeParenContext, unsigned parenContextSize) YARR_CALL;
public:
YarrCodeBlock() = default;
@@ -96,9 +79,10 @@
void set8BitCodeMatchOnly(MacroAssemblerCodeRef<YarrMatchOnly8BitPtrTag> matchOnly) { m_matchOnly8 = matchOnly; }
void set16BitCodeMatchOnly(MacroAssemblerCodeRef<YarrMatchOnly16BitPtrTag> matchOnly) { m_matchOnly16 = matchOnly; }
+ bool usesPatternContextBuffer() { return m_usesPatternContextBuffer; }
#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
- bool usesPatternContextBuffer() { return m_usesPatternContextBuffer; }
void setUsesPatternContextBuffer() { m_usesPatternContextBuffer = true; }
+#endif
MatchResult execute(const LChar* input, unsigned start, unsigned length, int* output, void* freeParenContext, unsigned parenContextSize)
{
@@ -123,32 +107,7 @@
ASSERT(has16BitCodeMatchOnly());
return MatchResult(untagCFunctionPtr<YarrJITCodeMatchOnly16, YarrMatchOnly16BitPtrTag>(m_matchOnly16.code().executableAddress())(input, start, length, 0, freeParenContext, parenContextSize));
}
-#else
- MatchResult execute(const LChar* input, unsigned start, unsigned length, int* output)
- {
- ASSERT(has8BitCode());
- return MatchResult(reinterpret_cast<YarrJITCode8>(m_ref8.code().executableAddress())(input, start, length, output));
- }
- MatchResult execute(const UChar* input, unsigned start, unsigned length, int* output)
- {
- ASSERT(has16BitCode());
- return MatchResult(reinterpret_cast<YarrJITCode16>(m_ref16.code().executableAddress())(input, start, length, output));
- }
-
- MatchResult execute(const LChar* input, unsigned start, unsigned length)
- {
- ASSERT(has8BitCodeMatchOnly());
- return MatchResult(reinterpret_cast<YarrJITCodeMatchOnly8>(m_matchOnly8.code().executableAddress())(input, start, length));
- }
-
- MatchResult execute(const UChar* input, unsigned start, unsigned length)
- {
- ASSERT(has16BitCodeMatchOnly());
- return MatchResult(reinterpret_cast<YarrJITCodeMatchOnly16>(m_matchOnly16.code().executableAddress())(input, start, length));
- }
-#endif
-
#if ENABLE(REGEXP_TRACING)
void *get8BitMatchOnlyAddr()
{
@@ -202,9 +161,7 @@
MacroAssemblerCodeRef<Yarr16BitPtrTag> m_ref16;
MacroAssemblerCodeRef<YarrMatchOnly8BitPtrTag> m_matchOnly8;
MacroAssemblerCodeRef<YarrMatchOnly16BitPtrTag> m_matchOnly16;
-#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
- bool m_usesPatternContextBuffer;
-#endif
+ bool m_usesPatternContextBuffer { false };
Optional<JITFailureReason> m_failureReason;
};
