<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280520] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280520">280520</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2021-07-31 13:47:46 -0700 (Sat, 31 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Move JIT_UNICODE_EXPRESSIONS to ENABLE(YARR_JIT_UNICODE_EXPRESSIONS) in PlatformEnable.h
https://bugs.webkit.org/show_bug.cgi?id=228669

Reviewed by Alexey Shvayka.

Source/JavaScriptCore:

Move JIT_UNICODE_EXPRESSIONS to PlatformEnable.h to align to the other YarrJIT flags.
This makes it easy to read that this is enabled on ARM64 and X86_64.

* yarr/YarrJIT.cpp:

Source/WTF:

* wtf/PlatformEnable.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrJITcpp">trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformEnableh">trunk/Source/WTF/wtf/PlatformEnable.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (280519 => 280520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-07-31 20:43:43 UTC (rev 280519)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-07-31 20:47:46 UTC (rev 280520)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2021-07-31  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><ins>+        [JSC] Move JIT_UNICODE_EXPRESSIONS to ENABLE(YARR_JIT_UNICODE_EXPRESSIONS) in PlatformEnable.h
+        https://bugs.webkit.org/show_bug.cgi?id=228669
+
+        Reviewed by Alexey Shvayka.
+
+        Move JIT_UNICODE_EXPRESSIONS to PlatformEnable.h to align to the other YarrJIT flags.
+        This makes it easy to read that this is enabled on ARM64 and X86_64.
+
+        * yarr/YarrJIT.cpp:
+
+2021-07-31  Yusuke Suzuki  <ysuzuki@apple.com>
+
</ins><span class="cx">         [JSC] Clean up Yarr by using `static constexpr`
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=228678
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp (280519 => 280520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp     2021-07-31 20:43:43 UTC (rev 280519)
+++ trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp        2021-07-31 20:47:46 UTC (rev 280520)
</span><span class="lines">@@ -198,7 +198,6 @@
</span><span class="cx">     static constexpr RegisterID returnRegister2 = ARM64Registers::x1;
</span><span class="cx"> 
</span><span class="cx">     static constexpr TrustedImm32 surrogateTagMask = TrustedImm32(0xfffffc00);
</span><del>-#define JIT_UNICODE_EXPRESSIONS
</del><span class="cx"> #elif CPU(MIPS)
</span><span class="cx">     static constexpr RegisterID input = MIPSRegisters::a0;
</span><span class="cx">     static constexpr RegisterID index = MIPSRegisters::a1;
</span><span class="lines">@@ -259,7 +258,6 @@
</span><span class="cx">     static constexpr TrustedImm32 leadingSurrogateTag = TrustedImm32(0xd800);
</span><span class="cx">     static constexpr TrustedImm32 trailingSurrogateTag = TrustedImm32(0xdc00);
</span><span class="cx">     static constexpr TrustedImm32 surrogateTagMask = TrustedImm32(0xfffffc00);
</span><del>-#define JIT_UNICODE_EXPRESSIONS
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
</span><span class="lines">@@ -561,7 +559,7 @@
</span><span class="cx">             unicodeFail.link(this);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">     void advanceIndexAfterCharacterClassTermMatch(const PatternTerm* term, JumpList& failuresAfterIncrementingIndex, const RegisterID character)
</span><span class="cx">     {
</span><span class="cx">         ASSERT(term->type == PatternTerm::Type::CharacterClass);
</span><span class="lines">@@ -644,7 +642,7 @@
</span><span class="cx">         return BaseIndex(input, indexReg, TimesTwo, characterOffset * static_cast<int32_t>(sizeof(UChar)));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">     void tryReadUnicodeCharImpl(RegisterID resultReg)
</span><span class="cx">     {
</span><span class="cx">         ASSERT(m_charSize == CharSize::Char16);
</span><span class="lines">@@ -691,7 +689,7 @@
</span><span class="cx"> 
</span><span class="cx">         if (m_charSize == CharSize::Char8)
</span><span class="cx">             load8(address, resultReg);
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         else if (m_decodeSurrogatePairs)
</span><span class="cx">             tryReadUnicodeChar(address, resultReg);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1679,7 +1677,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         op.m_jumps.append(branch32(NotEqual, character, Imm32(ch)));
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs && !U_IS_BMP(ch))
</span><span class="cx">             add32(TrustedImm32(2), countRegister);
</span><span class="cx">         else
</span><span class="lines">@@ -1711,7 +1709,7 @@
</span><span class="cx">             failures.append(jumpIfCharNotEquals(ch, m_checkedOffset - term->inputPosition, character));
</span><span class="cx"> 
</span><span class="cx">             add32(TrustedImm32(1), index);
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">             if (m_decodeSurrogatePairs && !U_IS_BMP(ch)) {
</span><span class="cx">                 Jump surrogatePairOk = notAtEndOfInput();
</span><span class="cx">                 sub32(TrustedImm32(1), index);
</span><span class="lines">@@ -1785,7 +1783,7 @@
</span><span class="cx">             nonGreedyFailures.append(jumpIfCharNotEquals(ch, m_checkedOffset - term->inputPosition, character));
</span><span class="cx"> 
</span><span class="cx">             add32(TrustedImm32(1), index);
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">             if (m_decodeSurrogatePairs && !U_IS_BMP(ch)) {
</span><span class="cx">                 Jump surrogatePairOk = notAtEndOfInput();
</span><span class="cx">                 sub32(TrustedImm32(1), index);
</span><span class="lines">@@ -1835,7 +1833,7 @@
</span><span class="cx">                 matchDest.link(this);
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs && (!term->characterClass->hasOneCharacterSize() || term->invert())) {
</span><span class="cx">             Jump isBMPChar = branch32(LessThan, character, supplementaryPlanesBase);
</span><span class="cx">             op.m_jumps.append(atEndOfInput());
</span><span class="lines">@@ -1846,7 +1844,7 @@
</span><span class="cx">     }
</span><span class="cx">     void backtrackCharacterClassOnce(size_t opIndex)
</span><span class="cx">     {
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs) {
</span><span class="cx">             YarrOp& op = m_ops[opIndex];
</span><span class="cx">             PatternTerm* term = op.m_term;
</span><span class="lines">@@ -1874,7 +1872,7 @@
</span><span class="cx"> 
</span><span class="cx">         Checked<unsigned> scaledMaxCount = term->quantityMaxCount;
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs && term->characterClass->hasOnlyNonBMPCharacters() && !term->invert())
</span><span class="cx">             scaledMaxCount *= 2;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1896,7 +1894,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs) {
</span><span class="cx">             if (term->isFixedWidthCharacterClass())
</span><span class="cx">                 add32(TrustedImm32(term->characterClass->hasNonBMPCharacters() ? 2 : 1), countRegister);
</span><span class="lines">@@ -1933,7 +1931,7 @@
</span><span class="cx">         JumpList failures;
</span><span class="cx">         JumpList failuresDecrementIndex;
</span><span class="cx">         Label loop(this);
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (term->isFixedWidthCharacterClass() && term->characterClass->hasNonBMPCharacters()) {
</span><span class="cx">             move(TrustedImm32(1), character);
</span><span class="cx">             failures.append(checkNotEnoughInput(character));
</span><span class="lines">@@ -1956,7 +1954,7 @@
</span><span class="cx">             matchDest.link(this);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs)
</span><span class="cx">             advanceIndexAfterCharacterClassTermMatch(term, failuresDecrementIndex, character);
</span><span class="cx">         else
</span><span class="lines">@@ -2012,7 +2010,7 @@
</span><span class="cx">             sub32(TrustedImm32(1), countRegister);
</span><span class="cx">             add32(TrustedImm32(1), index);
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">             Jump isBMPChar = branch32(LessThan, character, supplementaryPlanesBase);
</span><span class="cx">             add32(TrustedImm32(1), index);
</span><span class="cx">             isBMPChar.link(this);
</span><span class="lines">@@ -2036,7 +2034,7 @@
</span><span class="cx">         move(TrustedImm32(0), countRegister);
</span><span class="cx">         op.m_reentry = label();
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs) {
</span><span class="cx">             if (!term->characterClass->hasOneCharacterSize() || term->invert())
</span><span class="cx">                 storeToFrame(index, term->frameLocation + BackTrackInfoCharacterClass::beginIndex());
</span><span class="lines">@@ -2059,7 +2057,7 @@
</span><span class="cx"> 
</span><span class="cx">         m_backtrackingState.link(this);
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs) {
</span><span class="cx">             if (!term->characterClass->hasOneCharacterSize() || term->invert())
</span><span class="cx">                 loadFromFrame(term->frameLocation + BackTrackInfoCharacterClass::beginIndex(), index);
</span><span class="lines">@@ -2086,7 +2084,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs)
</span><span class="cx">             advanceIndexAfterCharacterClassTermMatch(term, nonGreedyFailuresDecrementIndex, character);
</span><span class="cx">         else
</span><span class="lines">@@ -3930,7 +3928,7 @@
</span><span class="cx"> 
</span><span class="cx">     void generateTryReadUnicodeCharacterHelper()
</span><span class="cx">     {
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_tryReadUnicodeCharacterCalls.isEmpty())
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="lines">@@ -4074,7 +4072,7 @@
</span><span class="cx">     {
</span><span class="cx">         YarrCodeBlock& codeBlock = m_codeBlock;
</span><span class="cx"> 
</span><del>-#ifndef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if !ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs) {
</span><span class="cx">             codeBlock.setFallBackWithFailureReason(JITFailureReason::DecodeSurrogatePair);
</span><span class="cx">             return;
</span><span class="lines">@@ -4140,7 +4138,7 @@
</span><span class="cx">             move(regT0, stackPointerRegister);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-#ifdef JIT_UNICODE_EXPRESSIONS
</del><ins>+#if ENABLE(YARR_JIT_UNICODE_EXPRESSIONS)
</ins><span class="cx">         if (m_decodeSurrogatePairs)
</span><span class="cx">             getEffectiveAddress(BaseIndex(input, length, TimesTwo), endOfStringAddress);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (280519 => 280520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-07-31 20:43:43 UTC (rev 280519)
+++ trunk/Source/WTF/ChangeLog  2021-07-31 20:47:46 UTC (rev 280520)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2021-07-31  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Move JIT_UNICODE_EXPRESSIONS to ENABLE(YARR_JIT_UNICODE_EXPRESSIONS) in PlatformEnable.h
+        https://bugs.webkit.org/show_bug.cgi?id=228669
+
+        Reviewed by Alexey Shvayka.
+
+        * wtf/PlatformEnable.h:
+
</ins><span class="cx"> 2021-07-30  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [css-overflow] Implement clip value for overflow
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformEnableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformEnable.h (280519 => 280520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformEnable.h    2021-07-31 20:43:43 UTC (rev 280519)
+++ trunk/Source/WTF/wtf/PlatformEnable.h       2021-07-31 20:47:46 UTC (rev 280520)
</span><span class="lines">@@ -751,6 +751,10 @@
</span><span class="cx"> #define ENABLE_YARR_JIT_BACKREFERENCES 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if CPU(ARM64) || CPU(X86_64)
+#define ENABLE_YARR_JIT_UNICODE_EXPRESSIONS 1
+#endif
+
</ins><span class="cx"> /* If either the JIT or the RegExp JIT is enabled, then the Assembler must be
</span><span class="cx">    enabled as well: */
</span><span class="cx"> #if ENABLE(JIT) || ENABLE(YARR_JIT) || !ENABLE(C_LOOP)
</span></span></pre>
</div>
</div>

</body>
</html>