<!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>[206642] 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/206642">206642</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-09-30 10:02:46 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>64-bit LLInt needs to have a concurrency-aware barrier
https://bugs.webkit.org/show_bug.cgi?id=162790
Reviewed by Mark Lam.
In a concurrent GC the barrier definitely has to be after the store, not before it.
* llint/LowLevelInterpreter64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206641 => 206642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-30 17:00:22 UTC (rev 206641)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-30 17:02:46 UTC (rev 206642)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-30 Filip Pizlo <fpizlo@apple.com>
+
+ 64-bit LLInt needs to have a concurrency-aware barrier
+ https://bugs.webkit.org/show_bug.cgi?id=162790
+
+ Reviewed by Mark Lam.
+
+ In a concurrent GC the barrier definitely has to be after the store, not before it.
+
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2016-09-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Air should have a way of expressing additional instruction flags
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (206641 => 206642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-09-30 17:00:22 UTC (rev 206641)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-09-30 17:02:46 UTC (rev 206642)
</span><span class="lines">@@ -1287,7 +1287,6 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_put_by_id:
</span><span class="cx"> traceExecution()
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadisFromInstruction(1, t3)
</span><span class="cx"> loadConstantOrVariableCell(t3, t0, .opPutByIdSlow)
</span><span class="cx"> loadisFromInstruction(4, t2)
</span><span class="lines">@@ -1417,6 +1416,7 @@
</span><span class="cx"> loadConstantOrVariable(t1, t2)
</span><span class="cx"> loadisFromInstruction(5, t1)
</span><span class="cx"> storePropertyAtVariableOffset(t1, t0, t2)
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(9)
</span><span class="cx">
</span><span class="cx"> .opPutByIdSlow:
</span><span class="lines">@@ -1580,7 +1580,6 @@
</span><span class="cx">
</span><span class="cx"> macro putByVal(slowPath)
</span><span class="cx"> traceExecution()
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadisFromInstruction(1, t0)
</span><span class="cx"> loadConstantOrVariableCell(t0, t1, .opPutByValSlow)
</span><span class="cx"> loadpFromInstruction(4, t3)
</span><span class="lines">@@ -1597,6 +1596,7 @@
</span><span class="cx"> loadConstantOrVariable(operand, scratch)
</span><span class="cx"> bpb scratch, tagTypeNumber, .opPutByValSlow
</span><span class="cx"> storep scratch, address
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> end)
</span><span class="cx">
</span><span class="cx"> .opPutByValNotInt32:
</span><span class="lines">@@ -1613,6 +1613,7 @@
</span><span class="cx"> bdnequn ft0, ft0, .opPutByValSlow
</span><span class="cx"> .ready:
</span><span class="cx"> stored ft0, address
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> end)
</span><span class="cx">
</span><span class="cx"> .opPutByValNotDouble:
</span><span class="lines">@@ -1621,6 +1622,7 @@
</span><span class="cx"> macro (operand, scratch, address)
</span><span class="cx"> loadConstantOrVariable(operand, scratch)
</span><span class="cx"> storep scratch, address
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> end)
</span><span class="cx">
</span><span class="cx"> .opPutByValNotContiguous:
</span><span class="lines">@@ -1631,6 +1633,7 @@
</span><span class="cx"> loadisFromInstruction(3, t2)
</span><span class="cx"> loadConstantOrVariable(t2, t1)
</span><span class="cx"> storeq t1, ArrayStorage::m_vector[t0, t3, 8]
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(5)
</span><span class="cx">
</span><span class="cx"> .opPutByValArrayStorageEmpty:
</span><span class="lines">@@ -2252,16 +2255,16 @@
</span><span class="cx">
</span><span class="cx"> #pLocalClosureVar:
</span><span class="cx"> bineq t0, LocalClosureVar, .pGlobalProperty
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadVariable(1, t0)
</span><span class="cx"> putLocalClosureVar()
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(7)
</span><span class="cx">
</span><span class="cx"> .pGlobalProperty:
</span><span class="cx"> bineq t0, GlobalProperty, .pGlobalVar
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadWithStructureCheck(1, .pDynamic)
</span><span class="cx"> putProperty()
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(7)
</span><span class="cx">
</span><span class="cx"> .pGlobalVar:
</span><span class="lines">@@ -2279,16 +2282,16 @@
</span><span class="cx">
</span><span class="cx"> .pClosureVar:
</span><span class="cx"> bineq t0, ClosureVar, .pGlobalPropertyWithVarInjectionChecks
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadVariable(1, t0)
</span><span class="cx"> putClosureVar()
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(7)
</span><span class="cx">
</span><span class="cx"> .pGlobalPropertyWithVarInjectionChecks:
</span><span class="cx"> bineq t0, GlobalPropertyWithVarInjectionChecks, .pGlobalVarWithVarInjectionChecks
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadWithStructureCheck(1, .pDynamic)
</span><span class="cx"> putProperty()
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(7)
</span><span class="cx">
</span><span class="cx"> .pGlobalVarWithVarInjectionChecks:
</span><span class="lines">@@ -2308,10 +2311,10 @@
</span><span class="cx">
</span><span class="cx"> .pClosureVarWithVarInjectionChecks:
</span><span class="cx"> bineq t0, ClosureVarWithVarInjectionChecks, .pModuleVar
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> varInjectionCheck(.pDynamic)
</span><span class="cx"> loadVariable(1, t0)
</span><span class="cx"> putClosureVar()
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(7)
</span><span class="cx">
</span><span class="cx"> .pModuleVar:
</span><span class="lines">@@ -2337,12 +2340,12 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_put_to_arguments:
</span><span class="cx"> traceExecution()
</span><del>- writeBarrierOnOperands(1, 3)
</del><span class="cx"> loadVariable(1, t0)
</span><span class="cx"> loadi 16[PB, PC, 8], t1
</span><span class="cx"> loadisFromInstruction(3, t3)
</span><span class="cx"> loadConstantOrVariable(t3, t2)
</span><span class="cx"> storeq t2, DirectArguments_storage[t0, t1, 8]
</span><ins>+ writeBarrierOnOperands(1, 3)
</ins><span class="cx"> dispatch(4)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>