<!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>[181334] trunk/Source</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/181334">181334</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-03-10 12:29:13 -0700 (Tue, 10 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] JSC Build Warnings Need to be Resolved.
<https://webkit.org/b/142366>
Reviewed by Brent Fulgham.
Source/JavaScriptCore:
Applied some benign changes to make the MSVC compiler happy.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::fillJSValue):
* runtime/BasicBlockLocation.cpp:
(JSC::BasicBlockLocation::getExecutedRanges):
* runtime/ControlFlowProfiler.cpp:
(JSC::ControlFlowProfiler::hasBasicBlockAtTextOffsetBeenExecuted):
Source/WTF:
* wtf/Compiler.h:
- MSVC also does not have the CONSIDERS_UNREACHABLE_CODE quirk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeBasicBlockLocationcpp">trunk/Source/JavaScriptCore/runtime/BasicBlockLocation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeControlFlowProfilercpp">trunk/Source/JavaScriptCore/runtime/ControlFlowProfiler.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCompilerh">trunk/Source/WTF/wtf/Compiler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-03-10 Mark Lam <mark.lam@apple.com>
+
+ [Win] JSC Build Warnings Need to be Resolved.
+ <https://webkit.org/b/142366>
+
+ Reviewed by Brent Fulgham.
+
+ Applied some benign changes to make the MSVC compiler happy.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::fillJSValue):
+ * runtime/BasicBlockLocation.cpp:
+ (JSC::BasicBlockLocation::getExecutedRanges):
+ * runtime/ControlFlowProfiler.cpp:
+ (JSC::ControlFlowProfiler::hasBasicBlockAtTextOffsetBeenExecuted):
+
</ins><span class="cx"> 2015-03-10 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Upgrade Map, Set and WeakMap constructor interface
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> out.printf("\nConstants:\n");
</span><span class="cx"> size_t i = 0;
</span><span class="cx"> do {
</span><del>- const char* sourceCodeRepresentationDescription;
</del><ins>+ const char* sourceCodeRepresentationDescription = nullptr;
</ins><span class="cx"> switch (m_constantsSourceCodeRepresentation[i]) {
</span><span class="cx"> case SourceCodeRepresentation::Double:
</span><span class="cx"> sourceCodeRepresentationDescription = ": in source as double";
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> m_gprs.lock(gpr);
</span><span class="cx"> }
</span><span class="cx"> tagGPR = allocate();
</span><del>- uint32_t tag = JSValue::EmptyValueTag;
</del><ins>+ int32_t tag = JSValue::EmptyValueTag;
</ins><span class="cx"> DataFormat fillFormat = DataFormatJS;
</span><span class="cx"> switch (info.registerFormat()) {
</span><span class="cx"> case DataFormatInt32:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeBasicBlockLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/BasicBlockLocation.cpp (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/BasicBlockLocation.cpp 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/JavaScriptCore/runtime/BasicBlockLocation.cpp 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> int nextRangeStart = m_startOffset;
</span><span class="cx"> while (gaps.size()) {
</span><span class="cx"> Gap minGap(INT_MAX, 0);
</span><del>- unsigned minIdx = -1;
</del><ins>+ unsigned minIdx = std::numeric_limits<unsigned>::max();
</ins><span class="cx"> for (unsigned idx = 0; idx < gaps.size(); idx++) {
</span><span class="cx"> // Because we know that the Gaps inside m_gaps aren't enclosed within one another, it suffices to just check the first element to test ordering.
</span><span class="cx"> if (gaps[idx].first < minGap.first) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeControlFlowProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ControlFlowProfiler.cpp (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ControlFlowProfiler.cpp 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/JavaScriptCore/runtime/ControlFlowProfiler.cpp 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> int bestDistance = INT_MAX;
</span><span class="cx"> BasicBlockRange bestRange;
</span><span class="cx"> bestRange.m_startOffset = bestRange.m_endOffset = -1;
</span><ins>+ bestRange.m_hasExecuted = false; // Suppress MSVC warning.
</ins><span class="cx"> // Because some ranges may overlap because of function boundaries, make sure to find the smallest range enclosing the offset.
</span><span class="cx"> for (BasicBlockRange range : blocks) {
</span><span class="cx"> if (range.m_startOffset <= offset && offset <= range.m_endOffset && (range.m_endOffset - range.m_startOffset) < bestDistance) {
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/WTF/ChangeLog 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-10 Mark Lam <mark.lam@apple.com>
+
+ [Win] JSC Build Warnings Need to be Resolved.
+ <https://webkit.org/b/142366>
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/Compiler.h:
+ - MSVC also does not have the CONSIDERS_UNREACHABLE_CODE quirk.
+
</ins><span class="cx"> 2015-03-10 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc: tryFastMalloc shouldn't crash
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compiler.h (181333 => 181334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compiler.h 2015-03-10 19:13:48 UTC (rev 181333)
+++ trunk/Source/WTF/wtf/Compiler.h 2015-03-10 19:29:13 UTC (rev 181334)
</span><span class="lines">@@ -81,10 +81,6 @@
</span><span class="cx"> #define WTF_COMPILER_SUPPORTS_CXX_USER_LITERALS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !COMPILER(CLANG)
-#define WTF_COMPILER_QUIRK_CONSIDERS_UNREACHABLE_CODE 1
-#endif
-
</del><span class="cx"> #if COMPILER(GCC) && !COMPILER(CLANG) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
</span><span class="cx"> #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -128,6 +124,10 @@
</span><span class="cx"> #define WTF_COMPILER_SUNCC 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !COMPILER(CLANG) && !COMPILER(MSVC)
+#define WTF_COMPILER_QUIRK_CONSIDERS_UNREACHABLE_CODE 1
+#endif
+
</ins><span class="cx"> /* ==== COMPILER_SUPPORTS - additional compiler feature detection, in alphabetical order ==== */
</span><span class="cx">
</span><span class="cx"> /* COMPILER_SUPPORTS(EABI) */
</span></span></pre>
</div>
</div>
</body>
</html>