<!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>[281555] trunk/Source/JavaScriptCore</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/281555">281555</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-25 07:49:34 -0700 (Wed, 25 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/281523">r281523</a>.
https://bugs.webkit.org/show_bug.cgi?id=229494

broke cloop build

Reverted changeset:

"Add for-in OwnStructureMode optimizations to LLInt"
https://bugs.webkit.org/show_bug.cgi?id=229038
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/281523">r281523</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmarm64rb">trunk/Source/JavaScriptCore/offlineasm/arm64.rb</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmgenerate_offset_extractorrb">trunk/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeButterflyh">trunk/Source/JavaScriptCore/runtime/Butterfly.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyOffseth">trunk/Source/JavaScriptCore/runtime/PropertyOffset.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-08-25  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r281523.
+        https://bugs.webkit.org/show_bug.cgi?id=229494
+
+        broke cloop build
+
+        Reverted changeset:
+
+        "Add for-in OwnStructureMode optimizations to LLInt"
+        https://bugs.webkit.org/show_bug.cgi?id=229038
+        https://commits.webkit.org/r281523
+
</ins><span class="cx"> 2021-08-24  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp    2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp       2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -13647,7 +13647,7 @@
</span><span class="cx">                 m_jit.signExtend32ToPtr(scratchGPR, scratchGPR);
</span><span class="cx">                 if (!haveStorage)
</span><span class="cx">                     m_jit.loadPtr(MacroAssembler::Address(baseCellGPR, JSObject::butterflyOffset()), storageGPR);
</span><del>-                constexpr intptr_t offsetOfFirstProperty = offsetInButterfly(firstOutOfLineOffset) * static_cast<intptr_t>(sizeof(EncodedJSValue));
</del><ins>+                int32_t offsetOfFirstProperty = static_cast<int32_t>(offsetInButterfly(firstOutOfLineOffset)) * sizeof(EncodedJSValue);
</ins><span class="cx">                 m_jit.loadValue(MacroAssembler::BaseIndex(storageGPR, scratchGPR, MacroAssembler::TimesEight, offsetOfFirstProperty), resultRegs);
</span><span class="cx">                 doneCases.append(m_jit.jump());
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp      2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -13258,7 +13258,7 @@
</span><span class="cx"> 
</span><span class="cx">         LValue realIndex = m_out.signExt32To64(
</span><span class="cx">             m_out.neg(m_out.sub(index, inlineCapacity)));
</span><del>-        constexpr intptr_t offsetOfFirstProperty = offsetInButterfly(firstOutOfLineOffset) * static_cast<intptr_t>(sizeof(EncodedJSValue));
</del><ins>+        int32_t offsetOfFirstProperty = static_cast<int32_t>(offsetInButterfly(firstOutOfLineOffset)) * sizeof(EncodedJSValue);
</ins><span class="cx">         results.append(m_out.anchor(
</span><span class="cx">             m_out.load64(m_out.baseIndex(m_heaps.properties.atAnyNumber(), storage, realIndex, ScaleEight, offsetOfFirstProperty))));
</span><span class="cx">         m_out.jump(continuation);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp    2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp       2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -3089,7 +3089,7 @@
</span><span class="cx">     sub32(Address(regT2, JSPropertyNameEnumerator::cachedInlineCapacityOffset()), regT3);
</span><span class="cx">     neg32(regT3);
</span><span class="cx">     signExtend32ToPtr(regT3, regT3);
</span><del>-    constexpr intptr_t offsetOfFirstProperty = offsetInButterfly(firstOutOfLineOffset) * static_cast<intptr_t>(sizeof(EncodedJSValue));
</del><ins>+    int32_t offsetOfFirstProperty = static_cast<int32_t>(offsetInButterfly(firstOutOfLineOffset)) * sizeof(EncodedJSValue);
</ins><span class="cx">     load64(BaseIndex(regT0, regT3, TimesEight, offsetOfFirstProperty), resultGPR);
</span><span class="cx">     doneCases.append(jump());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm        2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm   2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -1994,6 +1994,10 @@
</span><span class="cx"> slowPathOp(define_data_property)
</span><span class="cx"> slowPathOp(get_by_val_with_this)
</span><span class="cx"> slowPathOp(get_property_enumerator)
</span><ins>+slowPathOp(enumerator_next)
+slowPathOp(enumerator_get_by_val)
+slowPathOp(enumerator_in_by_val)
+slowPathOp(enumerator_has_own_property)
</ins><span class="cx"> 
</span><span class="cx"> if not JSVALUE64
</span><span class="cx">     slowPathOp(get_prototype_of)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm   2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm      2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -3079,7 +3079,3 @@
</span><span class="cx">     dispatch()
</span><span class="cx"> end)
</span><span class="cx"> 
</span><del>-slowPathOp(enumerator_next)
-slowPathOp(enumerator_get_by_val)
-slowPathOp(enumerator_in_by_val)
-slowPathOp(enumerator_has_own_property)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm      2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -534,11 +534,6 @@
</span><span class="cx">     loadq [cfr, valueReg, 8], valueReg
</span><span class="cx"> end
</span><span class="cx"> 
</span><del>-macro storeVariable(get, fieldName, newValueReg, scratchReg)
-    get(fieldName, scratchReg)
-    storeq newValueReg, [cfr, scratchReg, 8]
-end
-
</del><span class="cx"> # Index and value must be different registers. Index may be clobbered.
</span><span class="cx"> macro loadConstant(size, index, value)
</span><span class="cx">     macro loadNarrow()
</span><span class="lines">@@ -3078,7 +3073,8 @@
</span><span class="cx"> .notDone:
</span><span class="cx">     macro storeValueAndDispatch(v)
</span><span class="cx">         move v, t2
</span><del>-        storeVariable(get, m_value, t2, t1)
</del><ins>+        get(m_value, t1)
+        storeq t2, [cfr, t1, 8]
</ins><span class="cx">         checkStackPointerAlignment(t0, 0xbaddb01e)
</span><span class="cx">         dispatch()
</span><span class="cx">     end
</span><span class="lines">@@ -3093,114 +3089,7 @@
</span><span class="cx">     dispatch()
</span><span class="cx"> end)
</span><span class="cx"> 
</span><del>-llintOp(op_enumerator_next, OpEnumeratorNext, macro (size, get, dispatch)
-    # Note: this will always call the slow path on at least the first/last execution of EnumeratorNext for any given loop.
-    # The upside this is that we don't have to record any metadata or mode information here as the slow path will do it for us when transitioning from InitMode/IndexedMode to OwnStructureMode, or from OwnStructureMode to GenericMode.
-    get(m_mode, t0)
-    bbneq t0, constexpr JSPropertyNameEnumerator::OwnStructureMode, .nextSlowPath
</del><span class="cx"> 
</span><del>-    get(m_base, t1)
-    loadConstantOrVariableCell(size, t1, t0, .nextSlowPath)
-
-    loadVariable(get, m_enumerator, t1)
-    loadi JSPropertyNameEnumerator::m_cachedStructureID[t1], t2
-    bineq t2, JSCell::m_structureID[t0], .nextSlowPath
-
-    loadVariable(get, m_index, t2)
-    addq 1, t2
-    loadi JSPropertyNameEnumerator::m_endStructurePropertyIndex, t3
-    biaeq t2, t3, .nextSlowPath
-
-    storeVariable(get, m_index, t2, t3)
-    loadp JSPropertyNameEnumerator::m_propertyNames[t1], t3
-    zxi2q t2, t2
-    loadp [t3, t2, PtrSize], t3
-
-    storeVariable(get, m_propertyName, t3, t2)
-    dispatch()
-
-.nextSlowPath:
-    callSlowPath(_slow_path_enumerator_next)
-    dispatch()
-end)
-
-llintOpWithMetadata(op_enumerator_get_by_val, OpEnumeratorGetByVal, macro (size, get, dispatch, metadata, return)
-    metadata(t5, t0)
-
-    loadVariable(get, m_mode, t0)
-
-    # FIXME: This should be orb but that doesn't exist for some reason... https://bugs.webkit.org/show_bug.cgi?id=229445
-    loadb OpEnumeratorGetByVal::Metadata::m_enumeratorMetadata[t5], t1
-    ori t0, t1
-    storeb t1, OpEnumeratorGetByVal::Metadata::m_enumeratorMetadata[t5]
-
-    bbneq t0, constexpr JSPropertyNameEnumerator::OwnStructureMode, .getSlowPath
-
-    get(m_base, t1)
-    loadConstantOrVariableCell(size, t1, t0, .getSlowPath)
-
-    loadVariable(get, m_enumerator, t1)
-    loadi JSPropertyNameEnumerator::m_cachedStructureID[t1], t2
-    bineq t2, JSCell::m_structureID[t0], .getSlowPath
-
-    loadVariable(get, m_index, t2)
-    loadi JSPropertyNameEnumerator::m_cachedInlineCapacity[t1], t1
-    biaeq t2, t1, .outOfLine
-
-    zxi2q t2, t2
-    loadq sizeof JSObject[t0, t2, 8], t2
-    jmp .done
-
-.outOfLine:
-    loadp JSObject::m_butterfly[t0], t0
-    subi t1, t2
-    negi t2
-    sxi2q t2, t2
-    loadq constexpr ((offsetInButterfly(firstOutOfLineOffset)) * sizeof(EncodedJSValue))[t0, t2, 8], t2
-
-.done:
-    valueProfile(OpEnumeratorGetByVal, m_profile, t5, t2)
-    return(t2)
-
-.getSlowPath:
-    callSlowPath(_slow_path_enumerator_get_by_val)
-    dispatch()
-end)
-
-macro hasPropertyImpl(opcodeStruct, size, get, dispatch, metadata, return, slowPath)
-    metadata(t5, t0)
-
-    loadVariable(get, m_mode, t0)
-    # FIXME: This should be orb but that doesn't exist for some reason... https://bugs.webkit.org/show_bug.cgi?id=229445
-    loadb %opcodeStruct%::Metadata::m_enumeratorMetadata[t5], t1
-    ori t0, t1
-    storeb t1, %opcodeStruct%::Metadata::m_enumeratorMetadata[t5]
-
-    bbneq t0, constexpr JSPropertyNameEnumerator::OwnStructureMode, .callSlowPath
-
-    get(m_base, t1)
-    loadConstantOrVariableCell(size, t1, t0, .callSlowPath)
-
-    loadVariable(get, m_enumerator, t1)
-    loadi JSPropertyNameEnumerator::m_cachedStructureID[t1], t2
-    bineq t2, JSCell::m_structureID[t0], .callSlowPath
-
-    move ValueTrue, t2
-    return(t2)
-
-.callSlowPath:
-    callSlowPath(slowPath)
-    dispatch()
-end
-
-llintOpWithMetadata(op_enumerator_in_by_val, OpEnumeratorInByVal, macro (size, get, dispatch, metadata, return)
-    hasPropertyImpl(OpEnumeratorInByVal, size, get, dispatch, metadata, return, _slow_path_enumerator_in_by_val)
-end)
-
-llintOpWithMetadata(op_enumerator_has_own_property, OpEnumeratorHasOwnProperty, macro (size, get, dispatch, metadata, return)
-    hasPropertyImpl(OpEnumeratorHasOwnProperty, size, get, dispatch, metadata, return, _slow_path_enumerator_has_own_property)
-end)
-
</del><span class="cx"> llintOpWithProfile(op_get_internal_field, OpGetInternalField, macro (size, get, dispatch, return)
</span><span class="cx">     loadVariable(get, m_base, t1)
</span><span class="cx">     getu(size, OpGetInternalField, m_index, t2)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmarm64rb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/arm64.rb (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/arm64.rb  2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/offlineasm/arm64.rb     2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx">         when "move"
</span><span class="cx">             if operands[0].immediate?
</span><span class="cx">                 emitARM64MoveImmediate(operands[0].value, operands[1])
</span><del>-            elsif operands[0] != operands[1]
</del><ins>+            else
</ins><span class="cx">                 emitARM64("mov", operands, :quad)
</span><span class="cx">             end
</span><span class="cx">         when "moved"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmgenerate_offset_extractorrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb      2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb 2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -92,11 +92,6 @@
</span><span class="cx">             constsList = constsList(lowLevelAST)
</span><span class="cx"> 
</span><span class="cx">             emitCodeInConfiguration(concreteSettings, lowLevelAST, backend) {
</span><del>-
-                # Windows complains about signed integers being cast to unsigned but we just want the bits.
-                outp.puts "\#if COMPILER(MSVC)"
-                outp.puts "\#pragma warning(disable:4308)"
-                outp.puts "\#endif"
</del><span class="cx">                 constsList.each_with_index {
</span><span class="cx">                     | const, index |
</span><span class="cx">                     outp.puts "constexpr int64_t constValue#{index} = static_cast<int64_t>(#{const.value});"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeButterflyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Butterfly.h (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Butterfly.h  2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/runtime/Butterfly.h     2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     static ptrdiff_t offsetOfPropertyStorage() { return -static_cast<ptrdiff_t>(sizeof(IndexingHeader)); }
</span><del>-    constexpr static int indexOfPropertyStorage()
</del><ins>+    static int indexOfPropertyStorage()
</ins><span class="cx">     {
</span><span class="cx">         ASSERT(sizeof(IndexingHeader) == sizeof(EncodedJSValue));
</span><span class="cx">         return -1;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h   2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h      2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -1564,7 +1564,7 @@
</span><span class="cx">     return putDirectInternal<PutModeDefineOwnProperty>(vm, propertyName, value, 0, slot);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline intptr_t offsetInButterfly(PropertyOffset offset)
</del><ins>+inline size_t offsetInButterfly(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     return offsetInOutOfLineStorage(offset) + Butterfly::indexOfPropertyStorage();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyOffseth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyOffset.h (281554 => 281555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyOffset.h     2021-08-25 13:50:06 UTC (rev 281554)
+++ trunk/Source/JavaScriptCore/runtime/PropertyOffset.h        2021-08-25 14:49:34 UTC (rev 281555)
</span><span class="lines">@@ -37,26 +37,26 @@
</span><span class="cx"> static_assert(knownPolyProtoOffset < firstOutOfLineOffset, "We assume in all the JITs that the poly proto offset is an inline offset");
</span><span class="cx"> 
</span><span class="cx"> // Declare all of the functions because they tend to do forward calls.
</span><del>-constexpr inline void checkOffset(PropertyOffset);
-constexpr inline void checkOffset(PropertyOffset, int inlineCapacity);
-constexpr inline void validateOffset(PropertyOffset);
-constexpr inline void validateOffset(PropertyOffset, int inlineCapacity);
-constexpr inline bool isValidOffset(PropertyOffset);
-constexpr inline bool isInlineOffset(PropertyOffset);
-constexpr inline bool isOutOfLineOffset(PropertyOffset);
-constexpr inline intptr_t offsetInInlineStorage(PropertyOffset);
-constexpr inline intptr_t offsetInOutOfLineStorage(PropertyOffset);
-constexpr inline intptr_t offsetInRespectiveStorage(PropertyOffset);
-constexpr inline size_t numberOfOutOfLineSlotsForMaxOffset(PropertyOffset);
-constexpr inline size_t numberOfSlotsForMaxOffset(PropertyOffset, int inlineCapacity);
</del><ins>+inline void checkOffset(PropertyOffset);
+inline void checkOffset(PropertyOffset, int inlineCapacity);
+inline void validateOffset(PropertyOffset);
+inline void validateOffset(PropertyOffset, int inlineCapacity);
+inline bool isValidOffset(PropertyOffset);
+inline bool isInlineOffset(PropertyOffset);
+inline bool isOutOfLineOffset(PropertyOffset);
+inline size_t offsetInInlineStorage(PropertyOffset);
+inline size_t offsetInOutOfLineStorage(PropertyOffset);
+inline size_t offsetInRespectiveStorage(PropertyOffset);
+inline size_t numberOfOutOfLineSlotsForMaxOffset(PropertyOffset);
+inline size_t numberOfSlotsForMaxOffset(PropertyOffset, int inlineCapacity);
</ins><span class="cx"> 
</span><del>-constexpr inline void checkOffset(PropertyOffset offset)
</del><ins>+inline void checkOffset(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     UNUSED_PARAM(offset);
</span><span class="cx">     ASSERT(offset >= invalidOffset);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline void checkOffset(PropertyOffset offset, int inlineCapacity)
</del><ins>+inline void checkOffset(PropertyOffset offset, int inlineCapacity)
</ins><span class="cx"> {
</span><span class="cx">     UNUSED_PARAM(offset);
</span><span class="cx">     UNUSED_PARAM(inlineCapacity);
</span><span class="lines">@@ -66,37 +66,37 @@
</span><span class="cx">         || isOutOfLineOffset(offset));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline void validateOffset(PropertyOffset offset)
</del><ins>+inline void validateOffset(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset);
</span><span class="cx">     ASSERT(isValidOffset(offset));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline void validateOffset(PropertyOffset offset, int inlineCapacity)
</del><ins>+inline void validateOffset(PropertyOffset offset, int inlineCapacity)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset, inlineCapacity);
</span><span class="cx">     ASSERT(isValidOffset(offset));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline bool isValidOffset(PropertyOffset offset)
</del><ins>+inline bool isValidOffset(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset);
</span><span class="cx">     return offset != invalidOffset;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline bool isInlineOffset(PropertyOffset offset)
</del><ins>+inline bool isInlineOffset(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset);
</span><span class="cx">     return offset < firstOutOfLineOffset;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline bool isOutOfLineOffset(PropertyOffset offset)
</del><ins>+inline bool isOutOfLineOffset(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset);
</span><span class="cx">     return !isInlineOffset(offset);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline intptr_t offsetInInlineStorage(PropertyOffset offset)
</del><ins>+inline size_t offsetInInlineStorage(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     validateOffset(offset);
</span><span class="cx">     ASSERT(isInlineOffset(offset));
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">     return offset;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline intptr_t offsetInOutOfLineStorage(PropertyOffset offset)
</del><ins>+inline size_t offsetInOutOfLineStorage(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     validateOffset(offset);
</span><span class="cx">     ASSERT(isOutOfLineOffset(offset));
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">     return -static_cast<ptrdiff_t>(offset - firstOutOfLineOffset) - 1;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline intptr_t offsetInRespectiveStorage(PropertyOffset offset)
</del><ins>+inline size_t offsetInRespectiveStorage(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     if (isInlineOffset(offset))
</span><span class="cx">         return offsetInInlineStorage(offset);
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">     return offsetInOutOfLineStorage(offset);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline size_t numberOfOutOfLineSlotsForMaxOffset(PropertyOffset offset)
</del><ins>+inline size_t numberOfOutOfLineSlotsForMaxOffset(PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset);
</span><span class="cx">     if (offset < firstOutOfLineOffset)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">     return offset - firstOutOfLineOffset + 1;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline size_t numberOfSlotsForMaxOffset(PropertyOffset offset, int inlineCapacity)
</del><ins>+inline size_t numberOfSlotsForMaxOffset(PropertyOffset offset, int inlineCapacity)
</ins><span class="cx"> {
</span><span class="cx">     checkOffset(offset, inlineCapacity);
</span><span class="cx">     if (offset < inlineCapacity)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">     return inlineCapacity + numberOfOutOfLineSlotsForMaxOffset(offset);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-constexpr inline PropertyOffset offsetForPropertyNumber(int propertyNumber, int inlineCapacity)
</del><ins>+inline PropertyOffset offsetForPropertyNumber(int propertyNumber, int inlineCapacity)
</ins><span class="cx"> {
</span><span class="cx">     PropertyOffset offset = propertyNumber;
</span><span class="cx">     if (offset >= inlineCapacity) {
</span></span></pre>
</div>
</div>

</body>
</html>