<!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>[184580] branches/safari-600.7-branch/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/184580">184580</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 12:24:22 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for <a href="http://trac.webkit.org/projects/webkit/changeset/182827">r182827</a>. rdar://problem/20977128.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6007branchSourceJavaScriptCoreChangeLog">branches/safari-600.7-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6007branchSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#branchessafari6007branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6007branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Source/JavaScriptCore/ChangeLog (184579 => 184580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.7-branch/Source/JavaScriptCore/ChangeLog 2015-05-19 18:15:30 UTC (rev 184579)
+++ branches/safari-600.7-branch/Source/JavaScriptCore/ChangeLog 2015-05-19 19:24:22 UTC (rev 184580)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-05-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for r182827.
+
+ 2015-04-14 Michael Saboff <msaboff@apple.com>
+
+ DFG register fillSpeculate*() functions should validate incoming spill format is compatible with requested fill format
+ https://bugs.webkit.org/show_bug.cgi?id=143727
+
+ Reviewed by Geoffrey Garen.
+
+ Used the result of AbstractInterpreter<>::filter() to check that the current spill format is compatible
+ with the requested fill format. If filter() reports a contradiction, then we force an OSR exit.
+ Removed individual checks made redundant by the new check.
+
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::fillSpeculateInt32Internal):
+ (JSC::DFG::SpeculativeJIT::fillSpeculateCell):
+ (JSC::DFG::SpeculativeJIT::fillSpeculateBoolean):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::fillSpeculateInt32Internal):
+ (JSC::DFG::SpeculativeJIT::fillSpeculateInt52):
+ (JSC::DFG::SpeculativeJIT::fillSpeculateCell):
+ (JSC::DFG::SpeculativeJIT::fillSpeculateBoolean):
+
</ins><span class="cx"> 2015-03-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [FTL] inlined GetMyArgumentByVal with no arguments passed causes instant crash
</span></span></pre></div>
<a id="branchessafari6007branchSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (184579 => 184580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-05-19 18:15:30 UTC (rev 184579)
+++ branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-05-19 19:24:22 UTC (rev 184580)
</span><span class="lines">@@ -731,16 +731,16 @@
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><span class="cx"> SpeculatedType type = value.m_type;
</span><span class="cx"> ASSERT(edge.useKind() != KnownInt32Use || !(value.m_type & ~SpecInt32));
</span><del>- m_interpreter.filter(value, SpecInt32);
- VirtualRegister virtualRegister = edge->virtualRegister();
- GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</del><span class="cx">
</span><del>- if (edge->hasConstant() && !isInt32Constant(edge.node())) {
</del><ins>+ if (m_interpreter.filter(value, SpecInt32) == Contradiction) {
</ins><span class="cx"> terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
</span><span class="cx"> returnFormat = DataFormatInt32;
</span><span class="cx"> return allocate();
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ VirtualRegister virtualRegister = edge->virtualRegister();
+ GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
+
</ins><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatNone: {
</span><span class="cx"> if (edge->hasConstant()) {
</span><span class="lines">@@ -754,6 +754,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DataFormat spillFormat = info.spillFormat();
</span><ins>+
</ins><span class="cx"> ASSERT_UNUSED(spillFormat, (spillFormat & DataFormatJS) || spillFormat == DataFormatInt32);
</span><span class="cx">
</span><span class="cx"> // If we know this was spilled as an integer we can fill without checking.
</span><span class="lines">@@ -799,10 +800,6 @@
</span><span class="cx"> case DataFormatJSDouble:
</span><span class="cx"> case DataFormatJSCell:
</span><span class="cx"> case DataFormatJSBoolean:
</span><del>- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- returnFormat = DataFormatInt32;
- return allocate();
-
</del><span class="cx"> case DataFormatDouble:
</span><span class="cx"> case DataFormatStorage:
</span><span class="cx"> default:
</span><span class="lines">@@ -861,17 +858,17 @@
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><span class="cx"> SpeculatedType type = value.m_type;
</span><span class="cx"> ASSERT((edge.useKind() != KnownCellUse && edge.useKind() != KnownStringUse) || !(value.m_type & ~SpecCell));
</span><del>- m_interpreter.filter(value, SpecCell);
</del><ins>+
+ if (m_interpreter.filter(value, SpecCell) == Contradiction) {
+ terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
+ return allocate();
+ }
+
</ins><span class="cx"> VirtualRegister virtualRegister = edge->virtualRegister();
</span><span class="cx"> GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</span><span class="cx">
</span><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatNone: {
</span><del>- if (info.spillFormat() == DataFormatInt32) {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
- }
-
</del><span class="cx"> if (edge->hasConstant()) {
</span><span class="cx"> JSValue jsValue = valueOfJSConstant(edge.node());
</span><span class="cx"> GPRReg gpr = allocate();
</span><span class="lines">@@ -933,9 +930,6 @@
</span><span class="cx"> case DataFormatJSDouble:
</span><span class="cx"> case DataFormatJSBoolean:
</span><span class="cx"> case DataFormatBoolean:
</span><del>- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
-
</del><span class="cx"> case DataFormatDouble:
</span><span class="cx"> case DataFormatStorage:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="lines">@@ -950,27 +944,23 @@
</span><span class="cx"> {
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><span class="cx"> SpeculatedType type = value.m_type;
</span><del>- m_interpreter.filter(value, SpecBoolean);
</del><ins>+
+ if (m_interpreter.filter(value, SpecBoolean) == Contradiction) {
+ terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
+ return allocate();
+ }
+
</ins><span class="cx"> VirtualRegister virtualRegister = edge->virtualRegister();
</span><span class="cx"> GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</span><span class="cx">
</span><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatNone: {
</span><del>- if (info.spillFormat() == DataFormatInt32) {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
- }
-
</del><span class="cx"> if (edge->hasConstant()) {
</span><span class="cx"> JSValue jsValue = valueOfJSConstant(edge.node());
</span><span class="cx"> GPRReg gpr = allocate();
</span><del>- if (jsValue.isBoolean()) {
- m_gprs.retain(gpr, virtualRegister, SpillOrderConstant);
- m_jit.move(MacroAssembler::TrustedImm32(jsValue.asBoolean()), gpr);
- info.fillBoolean(*m_stream, gpr);
- return gpr;
- }
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
</del><ins>+ m_gprs.retain(gpr, virtualRegister, SpillOrderConstant);
+ m_jit.move(MacroAssembler::TrustedImm32(jsValue.asBoolean()), gpr);
+ info.fillBoolean(*m_stream, gpr);
</ins><span class="cx"> return gpr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1014,9 +1004,6 @@
</span><span class="cx"> case DataFormatJSDouble:
</span><span class="cx"> case DataFormatJSCell:
</span><span class="cx"> case DataFormatCell:
</span><del>- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
-
</del><span class="cx"> case DataFormatDouble:
</span><span class="cx"> case DataFormatStorage:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="branchessafari6007branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (184579 => 184580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-05-19 18:15:30 UTC (rev 184579)
+++ branches/safari-600.7-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-05-19 19:24:22 UTC (rev 184580)
</span><span class="lines">@@ -721,20 +721,16 @@
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><span class="cx"> SpeculatedType type = value.m_type;
</span><span class="cx"> ASSERT(edge.useKind() != KnownInt32Use || !(value.m_type & ~SpecInt32));
</span><del>- m_interpreter.filter(value, SpecInt32);
- VirtualRegister virtualRegister = edge->virtualRegister();
- GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</del><span class="cx">
</span><del>- if (edge->hasConstant() && !isInt32Constant(edge.node())) {
- // Protect the silent spill/fill logic by failing early. If we "speculate" on
- // the constant then the silent filler may think that we have an int32 and a
- // constant, so it will try to fill this as an int32 constant. Bad things will
- // happen.
</del><ins>+ if (m_interpreter.filter(value, SpecInt32) == Contradiction) {
</ins><span class="cx"> terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
</span><span class="cx"> returnFormat = DataFormatInt32;
</span><span class="cx"> return allocate();
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ VirtualRegister virtualRegister = edge->virtualRegister();
+ GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
+
</ins><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatNone: {
</span><span class="cx"> GPRReg gpr = allocate();
</span><span class="lines">@@ -833,12 +829,7 @@
</span><span class="cx"> case DataFormatCell:
</span><span class="cx"> case DataFormatBoolean:
</span><span class="cx"> case DataFormatJSCell:
</span><del>- case DataFormatJSBoolean: {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- returnFormat = DataFormatInt32;
- return allocate();
- }
-
</del><ins>+ case DataFormatJSBoolean:
</ins><span class="cx"> case DataFormatDouble:
</span><span class="cx"> case DataFormatStorage:
</span><span class="cx"> case DataFormatInt52:
</span><span class="lines">@@ -871,17 +862,17 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(desiredFormat == DataFormatInt52 || desiredFormat == DataFormatStrictInt52);
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><del>- m_interpreter.filter(value, SpecMachineInt);
</del><ins>+
+ if (m_interpreter.filter(value, SpecMachineInt) == Contradiction) {
+ terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
+ return allocate();
+ }
+
</ins><span class="cx"> VirtualRegister virtualRegister = edge->virtualRegister();
</span><span class="cx"> GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</span><span class="cx">
</span><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatNone: {
</span><del>- if ((edge->hasConstant() && !valueOfJSConstant(edge.node()).isMachineInt())) {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
- }
-
</del><span class="cx"> GPRReg gpr = allocate();
</span><span class="cx">
</span><span class="cx"> if (edge->hasConstant()) {
</span><span class="lines">@@ -1000,7 +991,12 @@
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><span class="cx"> SpeculatedType type = value.m_type;
</span><span class="cx"> ASSERT((edge.useKind() != KnownCellUse && edge.useKind() != KnownStringUse) || !(value.m_type & ~SpecCell));
</span><del>- m_interpreter.filter(value, SpecCell);
</del><ins>+
+ if (m_interpreter.filter(value, SpecCell) == Contradiction) {
+ terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
+ return allocate();
+ }
+
</ins><span class="cx"> VirtualRegister virtualRegister = edge->virtualRegister();
</span><span class="cx"> GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</span><span class="cx">
</span><span class="lines">@@ -1019,12 +1015,7 @@
</span><span class="cx"> terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
</span><span class="cx"> return gpr;
</span><span class="cx"> }
</span><del>-
- if (!(info.spillFormat() & DataFormatJS)) {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return gpr;
- }
-
</del><ins>+
</ins><span class="cx"> m_gprs.retain(gpr, virtualRegister, SpillOrderSpilled);
</span><span class="cx"> m_jit.load64(JITCompiler::addressFor(virtualRegister), gpr);
</span><span class="cx">
</span><span class="lines">@@ -1060,11 +1051,7 @@
</span><span class="cx"> case DataFormatInt32:
</span><span class="cx"> case DataFormatJSDouble:
</span><span class="cx"> case DataFormatJSBoolean:
</span><del>- case DataFormatBoolean: {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
- }
-
</del><ins>+ case DataFormatBoolean:
</ins><span class="cx"> case DataFormatDouble:
</span><span class="cx"> case DataFormatStorage:
</span><span class="cx"> case DataFormatInt52:
</span><span class="lines">@@ -1081,28 +1068,24 @@
</span><span class="cx"> {
</span><span class="cx"> AbstractValue& value = m_state.forNode(edge);
</span><span class="cx"> SpeculatedType type = value.m_type;
</span><del>- m_interpreter.filter(value, SpecBoolean);
</del><ins>+
+ if (m_interpreter.filter(value, SpecBoolean) == Contradiction) {
+ terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
+ return allocate();
+ }
+
</ins><span class="cx"> VirtualRegister virtualRegister = edge->virtualRegister();
</span><span class="cx"> GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
</span><span class="cx">
</span><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatNone: {
</span><del>- if (info.spillFormat() == DataFormatInt32) {
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
- }
-
</del><span class="cx"> GPRReg gpr = allocate();
</span><span class="cx">
</span><span class="cx"> if (edge->hasConstant()) {
</span><span class="cx"> JSValue jsValue = valueOfJSConstant(edge.node());
</span><del>- if (jsValue.isBoolean()) {
- m_gprs.retain(gpr, virtualRegister, SpillOrderConstant);
- m_jit.move(MacroAssembler::TrustedImm64(JSValue::encode(jsValue)), gpr);
- info.fillJSValue(*m_stream, gpr, DataFormatJSBoolean);
- return gpr;
- }
- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
</del><ins>+ m_gprs.retain(gpr, virtualRegister, SpillOrderConstant);
+ m_jit.move(MacroAssembler::TrustedImm64(JSValue::encode(jsValue)), gpr);
+ info.fillJSValue(*m_stream, gpr, DataFormatJSBoolean);
</ins><span class="cx"> return gpr;
</span><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT(info.spillFormat() & DataFormatJS);
</span><span class="lines">@@ -1143,9 +1126,6 @@
</span><span class="cx"> case DataFormatJSDouble:
</span><span class="cx"> case DataFormatJSCell:
</span><span class="cx"> case DataFormatCell:
</span><del>- terminateSpeculativeExecution(Uncountable, JSValueRegs(), 0);
- return allocate();
-
</del><span class="cx"> case DataFormatDouble:
</span><span class="cx"> case DataFormatStorage:
</span><span class="cx"> case DataFormatInt52:
</span></span></pre>
</div>
</div>
</body>
</html>