<!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>[174371] 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/174371">174371</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-10-06 15:17:09 -0700 (Mon, 06 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixed compiler warnings on Windows build.
&lt;https://webkit.org/b/135205&gt;

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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArgumentPositionh">trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGEdgeh">trunk/Source/JavaScriptCore/dfg/DFGEdge.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeFlagsh">trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp">trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGVariableAccessDatacpp">trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGVariableAccessDatah">trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSDataViewPrototypecpp">trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-10-06 22:17:09 UTC (rev 174371)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-10-06  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+        Fixed compiler warnings on Windows build.
+        &lt;https://webkit.org/b/135205&gt;
+
+        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"> 2014-10-06  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove incorrect assertion.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h        2014-10-06 22:17:09 UTC (rev 174371)
</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&lt;int32_t&gt;(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&lt;int32_t&gt;(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="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp        2014-10-06 22:17:09 UTC (rev 174371)
</span><span class="lines">@@ -2016,7 +2016,7 @@
</span><span class="cx">             // The format of this instruction is: op_profile_type regToProfile, TypeLocation*, flag, identifier?, resolveType?
</span><span class="cx">             size_t instructionOffset = i + opLength - 1;
</span><span class="cx">             unsigned divotStart, divotEnd;
</span><del>-            GlobalVariableID globalVariableID;
</del><ins>+            GlobalVariableID globalVariableID = 0;
</ins><span class="cx">             RefPtr&lt;TypeSet&gt; globalTypeSet;
</span><span class="cx">             bool shouldAnalyze = m_unlinkedCode-&gt;typeProfilerExpressionInfoForBytecodeOffset(instructionOffset, divotStart, divotEnd);
</span><span class="cx">             VirtualRegister profileRegister(pc[1].u.operand);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArgumentPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h        2014-10-06 22:17:09 UTC (rev 174371)
</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 &lt; m_variables.size(); ++i) {
</span><span class="cx">             VariableAccessData* variable = m_variables[i]-&gt;find();
</span><del>-            changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox | variable-&gt;isProfitableToUnbox());
</del><ins>+            changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox || variable-&gt;isProfitableToUnbox());
</ins><span class="cx">         }
</span><span class="cx">         if (!changed)
</span><span class="cx">             return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGEdgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGEdge.h (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGEdge.h        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/dfg/DFGEdge.h        2014-10-06 22:17:09 UTC (rev 174371)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">         ASSERT((shiftedValue &gt;&gt; shift()) == bitwise_cast&lt;uintptr_t&gt;(node));
</span><span class="cx">         ASSERT(useKind &gt;= 0 &amp;&amp; useKind &lt; LastUseKind);
</span><span class="cx">         ASSERT((static_cast&lt;uintptr_t&gt;(LastUseKind) &lt;&lt; 2) &lt;= (static_cast&lt;uintptr_t&gt;(2) &lt;&lt; shift()));
</span><del>-        return shiftedValue | (static_cast&lt;uintptr_t&gt;(useKind) &lt;&lt; 2) | (DFG::doesKill(killStatus) &lt;&lt; 1) | DFG::isProved(proofStatus);
</del><ins>+        return shiftedValue | (static_cast&lt;uintptr_t&gt;(useKind) &lt;&lt; 2) | (DFG::doesKill(killStatus) &lt;&lt; 1) | static_cast&lt;uintptr_t&gt;(DFG::isProved(proofStatus));
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeFlagsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h        2014-10-06 22:17:09 UTC (rev 174371)
</span><span class="lines">@@ -98,7 +98,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">@@ -115,7 +115,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="trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp        2014-10-06 22:17:09 UTC (rev 174371)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">         InlineCallFrame* inlineCallFrame = codeOrigin.inlineCallFrame;
</span><span class="cx">         CodeBlock* baselineCodeBlock = jit.baselineCodeBlockFor(codeOrigin);
</span><span class="cx">         CodeBlock* baselineCodeBlockForCaller = jit.baselineCodeBlockFor(inlineCallFrame-&gt;caller);
</span><del>-        void* jumpTarget;
</del><ins>+        void* jumpTarget = nullptr;
</ins><span class="cx">         void* trueReturnPC = nullptr;
</span><span class="cx">         
</span><span class="cx">         unsigned callBytecodeIndex = inlineCallFrame-&gt;caller.bytecodeIndex;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGVariableAccessDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.cpp        2014-10-06 22:17:09 UTC (rev 174371)
</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="trunkSourceJavaScriptCoredfgDFGVariableAccessDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h        2014-10-06 22:17:09 UTC (rev 174371)
</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="trunkSourceJavaScriptCoreruntimeJSDataViewPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp (174370 => 174371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp        2014-10-06 22:07:33 UTC (rev 174370)
+++ trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp        2014-10-06 22:17:09 UTC (rev 174371)
</span><span class="lines">@@ -144,7 +144,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&lt;uint8_t*&gt;(dataView-&gt;vector()) + byteOffset;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>