<!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>[178907] branches/safari-600.5-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/178907">178907</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 02:08:56 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174371">r174371</a>. rdar://problem/19450845</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreChangeLog">branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">branches/safari-600.5-branch/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoredfgDFGArgumentPositionh">branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGArgumentPosition.h</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoredfgDFGEdgeh">branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGEdge.h</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoredfgDFGNodeFlagsh">branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGNodeFlags.h</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoredfgDFGVariableAccessDatacpp">branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoredfgDFGVariableAccessDatah">branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.h</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreruntimeJSDataViewPrototypecpp">branches/safari-600.5-branch/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r174371. rdar://problem/19450845
+
+ 2014-10-06 Mark Lam <mark.lam@apple.com>
+
+ Fixed compiler warnings on Windows build.
+ <https://webkit.org/b/135205>
+
+ Reviewed by Geoffrey Garen.
+
+ Benchmarking with jsc shows that perf is neutral with this change.
+
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::call):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ * dfg/DFGArgumentPosition.h:
+ (JSC::DFG::ArgumentPosition::mergeShouldNeverUnbox):
+ (JSC::DFG::ArgumentPosition::mergeArgumentUnboxingAwareness):
+ * dfg/DFGEdge.h:
+ (JSC::DFG::Edge::makeWord):
+ * dfg/DFGNodeFlags.h:
+ (JSC::DFG::nodeMayOverflow):
+ (JSC::DFG::nodeMayNegZero):
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+ (JSC::DFG::reifyInlinedCallFrames):
+ * dfg/DFGVariableAccessData.cpp:
+ (JSC::DFG::VariableAccessData::mergeIsCaptured):
+ * dfg/DFGVariableAccessData.h:
+ (JSC::DFG::VariableAccessData::mergeIsProfitableToUnbox):
+ (JSC::DFG::VariableAccessData::mergeStructureCheckHoistingFailed):
+ (JSC::DFG::VariableAccessData::mergeCheckArrayHoistingFailed):
+ (JSC::DFG::VariableAccessData::mergeIsArgumentsAlias):
+ (JSC::DFG::VariableAccessData::mergeIsLoadedFrom):
+ * runtime/JSDataViewPrototype.cpp:
+ (JSC::getData):
+
</ins><span class="cx"> 2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178364. rdar://problem/19465091
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -203,11 +203,11 @@
</span><span class="cx">
</span><span class="cx"> // Copy argument 5
</span><span class="cx"> load64(Address(X86Registers::esp, 4 * sizeof(int64_t)), scratchRegister);
</span><del>- store64(scratchRegister, Address(X86Registers::esp, -4 * sizeof(int64_t)));
</del><ins>+ store64(scratchRegister, Address(X86Registers::esp, -4 * static_cast<int32_t>(sizeof(int64_t))));
</ins><span class="cx">
</span><span class="cx"> // Copy argument 6
</span><span class="cx"> load64(Address(X86Registers::esp, 5 * sizeof(int64_t)), scratchRegister);
</span><del>- store64(scratchRegister, Address(X86Registers::esp, -3 * sizeof(int64_t)));
</del><ins>+ store64(scratchRegister, Address(X86Registers::esp, -3 * static_cast<int32_t>(sizeof(int64_t))));
</ins><span class="cx">
</span><span class="cx"> // We also need to allocate the shadow space on the stack for the 4 parameter registers.
</span><span class="cx"> // Also, we should allocate 16 bytes for the frame pointer, and return address (not populated).
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoredfgDFGArgumentPositionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGArgumentPosition.h (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGArgumentPosition.h        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGArgumentPosition.h        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> bool mergeShouldNeverUnbox(bool shouldNeverUnbox)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox | shouldNeverUnbox);
</del><ins>+ return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox || shouldNeverUnbox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool mergeArgumentPredictionAwareness()
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> bool changed = false;
</span><span class="cx"> for (unsigned i = 0; i < m_variables.size(); ++i) {
</span><span class="cx"> VariableAccessData* variable = m_variables[i]->find();
</span><del>- changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox | variable->isProfitableToUnbox());
</del><ins>+ changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox || variable->isProfitableToUnbox());
</ins><span class="cx"> }
</span><span class="cx"> if (!changed)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoredfgDFGEdgeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGEdge.h (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGEdge.h        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGEdge.h        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> ASSERT((shiftedValue >> shift()) == bitwise_cast<uintptr_t>(node));
</span><span class="cx"> ASSERT(useKind >= 0 && useKind < LastUseKind);
</span><span class="cx"> ASSERT((static_cast<uintptr_t>(LastUseKind) << 2) <= (static_cast<uintptr_t>(2) << shift()));
</span><del>- return shiftedValue | (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | DFG::isProved(proofStatus);
</del><ins>+ return shiftedValue | (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | static_cast<uintptr_t>(DFG::isProved(proofStatus));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoredfgDFGNodeFlagsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGNodeFlags.h (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGNodeFlags.h        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGNodeFlags.h        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool nodeMayOverflow(NodeFlags flags, RareCaseProfilingSource source)
</span><span class="cx"> {
</span><del>- NodeFlags mask;
</del><ins>+ NodeFlags mask = 0;
</ins><span class="cx"> switch (source) {
</span><span class="cx"> case BaselineRareCase:
</span><span class="cx"> mask = NodeMayOverflowInBaseline;
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool nodeMayNegZero(NodeFlags flags, RareCaseProfilingSource source)
</span><span class="cx"> {
</span><del>- NodeFlags mask;
</del><ins>+ NodeFlags mask = 0;
</ins><span class="cx"> switch (source) {
</span><span class="cx"> case BaselineRareCase:
</span><span class="cx"> mask = NodeMayNegZeroInBaseline;
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoredfgDFGVariableAccessDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx">
</span><span class="cx"> bool VariableAccessData::mergeIsCaptured(bool isCaptured)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox | isCaptured)
- | checkAndSet(m_isCaptured, m_isCaptured | isCaptured);
</del><ins>+ return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox || isCaptured)
+ | checkAndSet(m_isCaptured, m_isCaptured || isCaptured);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool VariableAccessData::mergeShouldNeverUnbox(bool shouldNeverUnbox)
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoredfgDFGVariableAccessDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.h (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.h        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/dfg/DFGVariableAccessData.h        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> bool mergeIsProfitableToUnbox(bool isProfitableToUnbox)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox | isProfitableToUnbox);
</del><ins>+ return checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox || isProfitableToUnbox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isProfitableToUnbox()
</span><span class="lines">@@ -100,12 +100,12 @@
</span><span class="cx">
</span><span class="cx"> bool mergeStructureCheckHoistingFailed(bool failed)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_structureCheckHoistingFailed, m_structureCheckHoistingFailed | failed);
</del><ins>+ return checkAndSet(m_structureCheckHoistingFailed, m_structureCheckHoistingFailed || failed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool mergeCheckArrayHoistingFailed(bool failed)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_checkArrayHoistingFailed, m_checkArrayHoistingFailed | failed);
</del><ins>+ return checkAndSet(m_checkArrayHoistingFailed, m_checkArrayHoistingFailed || failed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool structureCheckHoistingFailed()
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> bool mergeIsArgumentsAlias(bool isArgumentsAlias)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_isArgumentsAlias, m_isArgumentsAlias | isArgumentsAlias);
</del><ins>+ return checkAndSet(m_isArgumentsAlias, m_isArgumentsAlias || isArgumentsAlias);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isArgumentsAlias()
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> bool mergeIsLoadedFrom(bool isLoadedFrom)
</span><span class="cx"> {
</span><del>- return checkAndSet(m_isLoadedFrom, m_isLoadedFrom | isLoadedFrom);
</del><ins>+ return checkAndSet(m_isLoadedFrom, m_isLoadedFrom || isLoadedFrom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setIsLoadedFrom(bool isLoadedFrom)
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreruntimeJSDataViewPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp (178906 => 178907)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp        2015-01-22 10:08:51 UTC (rev 178906)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp        2015-01-22 10:08:56 UTC (rev 178907)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> union {
</span><span class="cx"> typename Adaptor::Type value;
</span><span class="cx"> uint8_t rawBytes[dataSize];
</span><del>- } u;
</del><ins>+ } u = { };
</ins><span class="cx">
</span><span class="cx"> uint8_t* dataPtr = static_cast<uint8_t*>(dataView->vector()) + byteOffset;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>